C++: Model bsl functions in Scanf.qll.

criemen · web-flow · commit d9c6f7bc3564 · 2021-02-15T16:12:46.000Z
diff --git a/cpp/ql/src/semmle/code/cpp/commons/Scanf.qll b/cpp/ql/src/semmle/code/cpp/commons/Scanf.qll
@@ -34,10 +34,10 @@ class Scanf extends ScanfFunction {
   Scanf() {
     this instanceof TopLevelFunction and
     (
-      hasName("scanf") or // scanf(format, args...)
-      hasName("wscanf") or // wscanf(format, args...)
-      hasName("_scanf_l") or // _scanf_l(format, locale, args...)
-      hasName("_wscanf_l") // _wscanf_l(format, locale, args...)
+      hasGlobalOrStdishName("scanf") or // scanf(format, args...)
+      hasGlobalOrStdishName("wscanf") or // wscanf(format, args...)
+      hasGlobalName("_scanf_l") or // _scanf_l(format, locale, args...)
+      hasGlobalName("_wscanf_l") // _wscanf_l(format, locale, args...)
     )
   }
 
@@ -53,10 +53,10 @@ class Fscanf extends ScanfFunction {
   Fscanf() {
     this instanceof TopLevelFunction and
     (
-      hasName("fscanf") or // fscanf(src_stream, format, args...)
-      hasName("fwscanf") or // fwscanf(src_stream, format, args...)
-      hasName("_fscanf_l") or // _fscanf_l(src_stream, format, locale, args...)
-      hasName("_fwscanf_l") // _fwscanf_l(src_stream, format, locale, args...)
+      hasGlobalOrStdishName("fscanf") or // fscanf(src_stream, format, args...)
+      hasGlobalOrStdishName("fwscanf") or // fwscanf(src_stream, format, args...)
+      hasGlobalName("_fscanf_l") or // _fscanf_l(src_stream, format, locale, args...)
+      hasGlobalName("_fwscanf_l") // _fwscanf_l(src_stream, format, locale, args...)
     )
   }
 
@@ -72,10 +72,10 @@ class Sscanf extends ScanfFunction {
   Sscanf() {
     this instanceof TopLevelFunction and
     (
-      hasName("sscanf") or // sscanf(src_stream, format, args...)
-      hasName("swscanf") or // swscanf(src, format, args...)
-      hasName("_sscanf_l") or // _sscanf_l(src, format, locale, args...)
-      hasName("_swscanf_l") // _swscanf_l(src, format, locale, args...)
+      hasGlobalOrStdishName("sscanf") or // sscanf(src_stream, format, args...)
+      hasGlobalOrStdishName("swscanf") or // swscanf(src, format, args...)
+      hasGlobalName("_sscanf_l") or // _sscanf_l(src, format, locale, args...)
+      hasGlobalName("_swscanf_l") // _swscanf_l(src, format, locale, args...)
     )
   }
 
@@ -91,10 +91,10 @@ class Snscanf extends ScanfFunction {
   Snscanf() {
     this instanceof TopLevelFunction and
     (
-      hasName("_snscanf") or // _snscanf(src, max_amount, format, args...)
-      hasName("_snwscanf") or // _snwscanf(src, max_amount, format, args...)
-      hasName("_snscanf_l") or // _snscanf_l(src, max_amount, format, locale, args...)
-      hasName("_snwscanf_l") // _snwscanf_l(src, max_amount, format, locale, args...)
+      hasGlobalName("_snscanf") or // _snscanf(src, max_amount, format, args...)
+      hasGlobalName("_snwscanf") or // _snwscanf(src, max_amount, format, args...)
+      hasGlobalName("_snscanf_l") or // _snscanf_l(src, max_amount, format, locale, args...)
+      hasGlobalName("_snwscanf_l") // _snwscanf_l(src, max_amount, format, locale, args...)
       // note that the max_amount is not a limit on the output length, it's an input length
       // limit used with non null-terminated strings.
     )

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ class Scanf extends ScanfFunction {`
`34`	`34`	`Scanf() {`
`35`	`35`	`this instanceof TopLevelFunction and`
`36`	`36`	`(`
`37`		`- hasName("scanf") or // scanf(format, args...)`
`38`		`- hasName("wscanf") or // wscanf(format, args...)`
`39`		`- hasName("_scanf_l") or // _scanf_l(format, locale, args...)`
`40`		`- hasName("_wscanf_l") // _wscanf_l(format, locale, args...)`
	`37`	`+ hasGlobalOrStdishName("scanf") or // scanf(format, args...)`
	`38`	`+ hasGlobalOrStdishName("wscanf") or // wscanf(format, args...)`
	`39`	`+ hasGlobalName("_scanf_l") or // _scanf_l(format, locale, args...)`
	`40`	`+ hasGlobalName("_wscanf_l") // _wscanf_l(format, locale, args...)`
`41`	`41`	`)`
`42`	`42`	`}`
`43`	`43`
`@@ -53,10 +53,10 @@ class Fscanf extends ScanfFunction {`
`53`	`53`	`Fscanf() {`
`54`	`54`	`this instanceof TopLevelFunction and`
`55`	`55`	`(`
`56`		`- hasName("fscanf") or // fscanf(src_stream, format, args...)`
`57`		`- hasName("fwscanf") or // fwscanf(src_stream, format, args...)`
`58`		`- hasName("_fscanf_l") or // _fscanf_l(src_stream, format, locale, args...)`
`59`		`- hasName("_fwscanf_l") // _fwscanf_l(src_stream, format, locale, args...)`
	`56`	`+ hasGlobalOrStdishName("fscanf") or // fscanf(src_stream, format, args...)`
	`57`	`+ hasGlobalOrStdishName("fwscanf") or // fwscanf(src_stream, format, args...)`
	`58`	`+ hasGlobalName("_fscanf_l") or // _fscanf_l(src_stream, format, locale, args...)`
	`59`	`+ hasGlobalName("_fwscanf_l") // _fwscanf_l(src_stream, format, locale, args...)`
`60`	`60`	`)`
`61`	`61`	`}`
`62`	`62`
`@@ -72,10 +72,10 @@ class Sscanf extends ScanfFunction {`
`72`	`72`	`Sscanf() {`
`73`	`73`	`this instanceof TopLevelFunction and`
`74`	`74`	`(`
`75`		`- hasName("sscanf") or // sscanf(src_stream, format, args...)`
`76`		`- hasName("swscanf") or // swscanf(src, format, args...)`
`77`		`- hasName("_sscanf_l") or // _sscanf_l(src, format, locale, args...)`
`78`		`- hasName("_swscanf_l") // _swscanf_l(src, format, locale, args...)`
	`75`	`+ hasGlobalOrStdishName("sscanf") or // sscanf(src_stream, format, args...)`
	`76`	`+ hasGlobalOrStdishName("swscanf") or // swscanf(src, format, args...)`
	`77`	`+ hasGlobalName("_sscanf_l") or // _sscanf_l(src, format, locale, args...)`
	`78`	`+ hasGlobalName("_swscanf_l") // _swscanf_l(src, format, locale, args...)`
`79`	`79`	`)`
`80`	`80`	`}`
`81`	`81`
`@@ -91,10 +91,10 @@ class Snscanf extends ScanfFunction {`
`91`	`91`	`Snscanf() {`
`92`	`92`	`this instanceof TopLevelFunction and`
`93`	`93`	`(`
`94`		`- hasName("_snscanf") or // _snscanf(src, max_amount, format, args...)`
`95`		`- hasName("_snwscanf") or // _snwscanf(src, max_amount, format, args...)`
`96`		`- hasName("_snscanf_l") or // _snscanf_l(src, max_amount, format, locale, args...)`
`97`		`- hasName("_snwscanf_l") // _snwscanf_l(src, max_amount, format, locale, args...)`
	`94`	`+ hasGlobalName("_snscanf") or // _snscanf(src, max_amount, format, args...)`
	`95`	`+ hasGlobalName("_snwscanf") or // _snwscanf(src, max_amount, format, args...)`
	`96`	`+ hasGlobalName("_snscanf_l") or // _snscanf_l(src, max_amount, format, locale, args...)`
	`97`	`+ hasGlobalName("_snwscanf_l") // _snwscanf_l(src, max_amount, format, locale, args...)`
`98`	`98`	`// note that the max_amount is not a limit on the output length, it's an input length`
`99`	`99`	`// limit used with non null-terminated strings.`
`100`	`100`	`)`