Python: Exceptions.qll: Updates handledObject to use getOrigin

BekaValentine · BekaValentine · commit 5d55db116be1 · 2020-03-16T11:24:55.000-07:00
diff --git a/python/ql/src/semmle/python/types/Exceptions.qll b/python/ql/src/semmle/python/types/Exceptions.qll
@@ -276,7 +276,7 @@ class ExceptFlowNode extends ControlFlowNode {
             or
             exists(TupleValue tup |
                 this.handledObject(tup, ClassValue::tuple(), _) |
-                val = tup.getItem(_) and origin.pointsTo(val)
+                element_from_tuple(tup).pointsTo(val,origin) 
             )
         )
     }
@@ -317,6 +317,12 @@ private ControlFlowNode element_from_tuple_objectapi(Object tuple) {
     )
 }
 
+private ControlFlowNode element_from_tuple(Value tuple) {
+    exists(Tuple t |
+        t = tuple.getOrigin() and result = t.getAnElt().getAFlowNode()
+    )
+}
+
 /** A Reraising node is the node at the end of a finally block (on the exceptional branch)
  * that reraises the current exception.
  */

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ class ExceptFlowNode extends ControlFlowNode {`
`276`	`276`	`or`
`277`	`277`	`exists(TupleValue tup \|`
`278`	`278`	`this.handledObject(tup, ClassValue::tuple(), _) \|`
`279`		`- val = tup.getItem(_) and origin.pointsTo(val)`
	`279`	`+ element_from_tuple(tup).pointsTo(val,origin)`
`280`	`280`	`)`
`281`	`281`	`)`
`282`	`282`	`}`
`@@ -317,6 +317,12 @@ private ControlFlowNode element_from_tuple_objectapi(Object tuple) {`
`317`	`317`	`)`
`318`	`318`	`}`
`319`	`319`
	`320`	`+private ControlFlowNode element_from_tuple(Value tuple) {`
	`321`	`+ exists(Tuple t \|`
	`322`	`+ t = tuple.getOrigin() and result = t.getAnElt().getAFlowNode()`
	`323`	`+ )`
	`324`	`+}`
	`325`	`+`
`320`	`326`	`/** A Reraising node is the node at the end of a finally block (on the exceptional branch)`
`321`	`327`	`* that reraises the current exception.`
`322`	`328`	`*/`