Python: Modernise py/uninitialized-local-variable

RasmusWL · RasmusWL · commit aba3ac7b666c · 2019-12-20T15:05:49.000+01:00
diff --git a/python/ql/src/Variables/UninitializedLocal.ql b/python/ql/src/Variables/UninitializedLocal.ql
@@ -30,13 +30,11 @@ predicate uninitialized_local(NameNode use) {
 predicate explicitly_guarded(NameNode u) {
     exists(Try t |
         t.getBody().contains(u.getNode()) and
-        t.getAHandler().getType().refersTo(theNameErrorType())
+        t.getAHandler().getType().pointsTo(ClassValue::nameError())
     )
 }
 
 
 from NameNode u
 where uninitialized_local(u) and not explicitly_guarded(u)
 select u.getNode(), "Local variable '" + u.getId() + "' may be used before it is initialized."
-
-
diff --git a/python/ql/src/semmle/python/objects/ObjectAPI.qll b/python/ql/src/semmle/python/objects/ObjectAPI.qll
@@ -675,4 +675,9 @@ module ClassValue {
         result = TBuiltinClassObject(Builtin::special("NoneType"))
     }
 
+    /** Get the `ClassValue` for the `NameError` class. */
+    ClassValue nameError() {
+        result = TBuiltinClassObject(Builtin::builtin("NameError"))
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,11 @@ predicate uninitialized_local(NameNode use) {`
`30`	`30`	`predicate explicitly_guarded(NameNode u) {`
`31`	`31`	`exists(Try t \|`
`32`	`32`	`t.getBody().contains(u.getNode()) and`
`33`		`- t.getAHandler().getType().refersTo(theNameErrorType())`
	`33`	`+ t.getAHandler().getType().pointsTo(ClassValue::nameError())`
`34`	`34`	`)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`
`38`	`38`	`from NameNode u`
`39`	`39`	`where uninitialized_local(u) and not explicitly_guarded(u)`
`40`	`40`	`select u.getNode(), "Local variable '" + u.getId() + "' may be used before it is initialized."`
`41`		`-`
`42`		`-`
Original file line number	Diff line number	Diff line change
`@@ -675,4 +675,9 @@ module ClassValue {`
`675`	`675`	`result = TBuiltinClassObject(Builtin::special("NoneType"))`
`676`	`676`	`}`
`677`	`677`
	`678`	+ /** Get the `ClassValue` for the `NameError` class. */
	`679`	`+ ClassValue nameError() {`
	`680`	`+ result = TBuiltinClassObject(Builtin::builtin("NameError"))`
	`681`	`+ }`
	`682`	`+`
`678`	`683`	`}`