From 2b2ac82fb7a7bb78f250d68c418a59fecfe4b6a2 Mon Sep 17 00:00:00 2001 From: Benjamin Muskalla Date: Thu, 30 Sep 2021 12:48:27 +0200 Subject: [PATCH] Fix bug in sink detection --- java/ql/src/utils/model-generator/CaptureSinkModels.ql | 2 +- java/ql/test/utils/model-generator/CaptureSinkModels.expected | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/ql/src/utils/model-generator/CaptureSinkModels.ql b/java/ql/src/utils/model-generator/CaptureSinkModels.ql index d3a12bfdf25..af9676115a2 100644 --- a/java/ql/src/utils/model-generator/CaptureSinkModels.ql +++ b/java/ql/src/utils/model-generator/CaptureSinkModels.ql @@ -28,7 +28,7 @@ class PropagateToSinkConfiguration extends TaintTracking::Configuration { string asInputArgument(Expr source) { result = "Argument[" + source.(Argument).getPosition() + "]" or - result = source.(VarAccess).getVariable().toString() + result = "Argument[" + source.(VarAccess).getVariable().(Parameter).getPosition() + "]" } string captureSink(Callable api) { diff --git a/java/ql/test/utils/model-generator/CaptureSinkModels.expected b/java/ql/test/utils/model-generator/CaptureSinkModels.expected index a2d942d75da..dc043549bcf 100644 --- a/java/ql/test/utils/model-generator/CaptureSinkModels.expected +++ b/java/ql/test/utils/model-generator/CaptureSinkModels.expected @@ -1,3 +1,3 @@ | p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];create-file; | -| p;Sinks;true;readUrl;(URL,Charset);;url;open-url; | -| p;Sources;true;readUrl;(URL);;url;open-url; | +| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];open-url; | +| p;Sources;true;readUrl;(URL);;Argument[0];open-url; |