hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-29 18:55:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1199 from geoffw0/printfld

Browse Source 
CPP: Support %Ld in printf.qll
This commit is contained in:
Jonas Jensen
2019-04-03 15:38:16 +02:00
committed by GitHub
parent b79b53f5e3 aa21db3ed3
commit d0091b28ee
10 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpp/ql/src/semmle/code/cpp/commons/Printf.qll
View File

@@ -572,9 +572,8 @@ class FormatLiteral extends Literal {
((len="hh" and result instanceof IntType)
or (len="h" and result instanceof IntType)
or (len="l" and result = this.getLongType())
or ((len="ll" or len="q")
or ((len="ll" or len="L" or len="q")
and result instanceof LongLongType)
or (len="L" and result instanceof IntType) // doesn't affect integral conversion
or (len="j" and result = this.getIntmax_t())
or ((len="z" or len="Z")
and (result = this.getSize_t() or result = this.getSsize_t()))
@@ -599,9 +598,8 @@ class FormatLiteral extends Literal {
((len="hh" and result instanceof CharType)
or (len="h" and result instanceof ShortType)
or (len="l" and result = this.getLongType())
or ((len="ll" or len="q")
or ((len="ll" or len="L" or len="q")
and result instanceof LongLongType)
or (len="L" and result instanceof IntType) // doesn't affect integral conversion
or (len="j" and result = this.getIntmax_t())
or ((len="z" or len="Z")
and (result = this.getSize_t() or result = this.getSsize_t()))
@@ -622,7 +620,7 @@ class FormatLiteral extends Literal {
*/
FloatingPointType getFloatingPointConversion(int n) {
exists(string len | len = this.getLength(n) and
if len="L" then
if (len="L" or len="ll") then
result instanceof LongDoubleType
else
result instanceof DoubleType)
@@ -638,7 +636,7 @@ class FormatLiteral extends Literal {
(len="hh" and base instanceof CharType)
or (len="h" and base instanceof ShortType)
or (len="l" and base = this.getLongType())
or (len="ll" and base instanceof LongLongType)
or ((len="ll" or len="L") and base instanceof LongLongType)
or (len="q" and base instanceof LongLongType)
)
and base.isSigned() and base = result.getBaseType()

3
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_signed_chars/WrongTypeFormatArguments.expected
View File

@@ -10,7 +10,8 @@
| printf1.h:44:18:44:20 | ull | This argument should be of type 'int' but is of type 'unsigned long long' |
| printf1.h:45:18:45:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:46:18:46:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:47:19:47:21 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:113:17:113:17 | d | This argument should be of type 'long double' but is of type 'double' |
| printf1.h:114:18:114:18 | d | This argument should be of type 'long double' but is of type 'double' |
| real_world.h:61:21:61:22 | & ... | This argument should be of type 'int *' but is of type 'short *' |
| real_world.h:62:22:62:23 | & ... | This argument should be of type 'short *' but is of type 'int *' |
| real_world.h:63:22:63:24 | & ... | This argument should be of type 'short *' but is of type 'unsigned int *' |

35
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_signed_chars/printf1.h
View File

@@ -44,7 +44,7 @@ void f(char *s, int i, unsigned char *us, const char *cs, signed char *ss, char
printf("%d", ull); // not ok (unsigned long long -> int)
printf("%u", ull); // not ok (unsigned long long -> unsigned int)
printf("%x", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // ok
printf("%llx", ull); // ok
}
@@ -101,3 +101,36 @@ void fun1(unsigned char* a, unsigned char* b) {
printf("%td\n", pdt); // GOOD
printf("%td\n", a-b); // GOOD
}
void extensions()
{
{
long double ld;
double d;
printf("%Lg", ld); // GOOD
printf("%llg", ld); // GOOD (nonstandard equivalent to %Lg)
printf("%Lg", d); // BAD (should be %g)
printf("%llg", d); // BAD (should be %g)
}
{
long long int lli;
long int li;
printf("%lld", lli); // GOOD
printf("%Ld", lli); // GOOD (nonstandard equivalent to %lld)
printf("%Ld", li); // BAD (should be %ld) [NOT DETECTED]
printf("%lld", li); // BAD (should be %ld) [NOT DETECTED]
}
{
unsigned long long int ulli;
unsigned long int uli;
printf("%llu", ulli); // GOOD
printf("%Lu", ulli); // GOOD (nonstandard equivalent to %llu)
printf("%Lu", uli); // BAD (should be %lu) [NOT DETECTED]
printf("%llu", uli); // BAD (should be %lu) [NOT DETECTED]
}
}

1
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_unsigned_chars/WrongTypeFormatArguments.expected
View File

@@ -10,7 +10,6 @@
| printf1.h:44:18:44:20 | ull | This argument should be of type 'int' but is of type 'unsigned long long' |
| printf1.h:45:18:45:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:46:18:46:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:47:19:47:21 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:126:18:126:19 | wc | This argument should be of type 'char *' but is of type 'wchar_t *' |
| printf1.h:127:18:127:18 | c | This argument should be of type 'wchar_t *' but is of type 'char *' |
| real_world.h:61:21:61:22 | & ... | This argument should be of type 'int *' but is of type 'short *' |

2
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_unsigned_chars/printf1.h
View File

@@ -44,7 +44,7 @@ void f(char *s, int i, unsigned char *us, const char *cs, signed char *ss, char
printf("%d", ull); // not ok (unsigned long long -> int)
printf("%u", ull); // not ok (unsigned long long -> unsigned int)
printf("%x", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // ok
printf("%llx", ull); // ok
}

1
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft/WrongTypeFormatArguments.expected
View File

@@ -10,7 +10,6 @@
| printf1.h:44:18:44:20 | ull | This argument should be of type 'int' but is of type 'unsigned long long' |
| printf1.h:45:18:45:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:46:18:46:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:47:19:47:21 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:71:19:71:20 | st | This argument should be of type 'ssize_t' but is of type 'unsigned long long' |
| printf1.h:72:19:72:20 | ST | This argument should be of type 'ssize_t' but is of type 'unsigned long long' |
| printf1.h:73:19:73:22 | c_st | This argument should be of type 'ssize_t' but is of type 'unsigned long long' |

2
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft/printf1.h
View File

@@ -44,7 +44,7 @@ void f(char *s, int i, unsigned char *us, const char *cs, signed char *ss, char
printf("%d", ull); // not ok (unsigned long long -> int)
printf("%u", ull); // not ok (unsigned long long -> unsigned int)
printf("%x", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // ok
printf("%llx", ull); // ok
}

1
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft_no_wchar/WrongTypeFormatArguments.expected
View File

@@ -10,7 +10,6 @@
| printf1.h:44:18:44:20 | ull | This argument should be of type 'int' but is of type 'unsigned long long' |
| printf1.h:45:18:45:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:46:18:46:20 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:47:19:47:21 | ull | This argument should be of type 'unsigned int' but is of type 'unsigned long long' |
| printf1.h:71:19:71:20 | st | This argument should be of type 'ssize_t' but is of type 'unsigned long long' |
| printf1.h:72:19:72:20 | ST | This argument should be of type 'ssize_t' but is of type 'unsigned long long' |
| printf1.h:73:19:73:22 | c_st | This argument should be of type 'ssize_t' but is of type 'unsigned long long' |

2
cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft_no_wchar/printf1.h
View File

@@ -44,7 +44,7 @@ void f(char *s, int i, unsigned char *us, const char *cs, signed char *ss, char
printf("%d", ull); // not ok (unsigned long long -> int)
printf("%u", ull); // not ok (unsigned long long -> unsigned int)
printf("%x", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // not ok (unsigned long long -> unsigned int)
printf("%Lx", ull); // ok
printf("%llx", ull); // ok
}