replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix diagnostic format string for err_os_log_argument_to_big 

Patch by Sam McCall, test case by me.

Differential Revision: https://reviews.llvm.org/D25936

llvm-svn: 285065
This commit is contained in:
Benjamin Kramer 2016-10-25 12:39:28 +00:00
parent 20aa1779d0
commit 7dc585763e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -7570,7 +7570,7 @@ def warn_cfstring_truncated : Warning<
def err_os_log_format_not_string_constant : Error< def err_os_log_format_not_string_constant : Error<
"os_log() format argument is not a string constant">; "os_log() format argument is not a string constant">;
def err_os_log_argument_too_big : Error< def err_os_log_argument_too_big : Error<
"os_log() argument %d is too big (%d bytes, max %d)">; "os_log() argument %0 is too big (%1 bytes, max %2)">;
def warn_os_log_format_narg : Error< def warn_os_log_format_narg : Error<
"os_log() '%%n' format specifier is not allowed">, DefaultError; "os_log() '%%n' format specifier is not allowed">, DefaultError;

3
clang/test/SemaObjC/format-strings-oslog.m
View File

@ -36,6 +36,9 @@ void test_os_log_format(const char *pc, int i, void *p, void *buf) {
wchar_t wcs[] = {'a', 0}; wchar_t wcs[] = {'a', 0};
__builtin_os_log_format(buf, "%S", wcs); __builtin_os_log_format(buf, "%S", wcs);
printf("%S", wcs); printf("%S", wcs);
struct { char data[0x100]; } toobig;
__builtin_os_log_format(buf, "%s", toobig); // expected-error {{os_log() argument 2 is too big (256 bytes, max 255)}}
} }
// Test os_log_format primitive with ObjC string literal format argument. // Test os_log_format primitive with ObjC string literal format argument.