maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[sanitizer] Unconditionally write to target buffer in *sprintf interceptors. 

This does not change the default behavior (check_printf in on by default in all tools).
With this change, check_printf flag only affects format string parsing.

llvm-svn: 208290
This commit is contained in:
Evgeniy Stepanov 2014-05-08 09:18:22 +00:00
parent 6532c20faa
commit d31ac26230
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View File

@ -750,7 +750,7 @@ FORMAT_INTERCEPTOR_IMPL(__isoc99_sscanf, __isoc99_vsscanf, str, format)
printf_common(ctx, format, aq); \ printf_common(ctx, format, aq); \
} \ } \
int res = REAL(vname)(str, __VA_ARGS__); \ int res = REAL(vname)(str, __VA_ARGS__); \
if (res >= 0 && common_flags()->check_printf) { \ if (res >= 0) { \
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, str, res + 1); \ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, str, res + 1); \
} \ } \
VPRINTF_INTERCEPTOR_RETURN(); \ VPRINTF_INTERCEPTOR_RETURN(); \
@ -764,7 +764,7 @@ FORMAT_INTERCEPTOR_IMPL(__isoc99_sscanf, __isoc99_vsscanf, str, format)
printf_common(ctx, format, aq); \ printf_common(ctx, format, aq); \
} \ } \
int res = REAL(vname)(str, size, __VA_ARGS__); \ int res = REAL(vname)(str, size, __VA_ARGS__); \
if (res >= 0 && common_flags()->check_printf) { \ if (res >= 0) { \
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, str, Min(size, (SIZE_T)(res + 1))); \ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, str, Min(size, (SIZE_T)(res + 1))); \
} \ } \
VPRINTF_INTERCEPTOR_RETURN(); \ VPRINTF_INTERCEPTOR_RETURN(); \
@ -774,12 +774,12 @@ FORMAT_INTERCEPTOR_IMPL(__isoc99_sscanf, __isoc99_vsscanf, str, format)
#define VASPRINTF_INTERCEPTOR_IMPL(vname, strp, ...) \ #define VASPRINTF_INTERCEPTOR_IMPL(vname, strp, ...) \
{ \ { \
VPRINTF_INTERCEPTOR_ENTER(vname, strp, __VA_ARGS__) \ VPRINTF_INTERCEPTOR_ENTER(vname, strp, __VA_ARGS__) \
if (common_flags()->check_printf) { \
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, strp, sizeof(char *)); \ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, strp, sizeof(char *)); \
if (common_flags()->check_printf) { \
printf_common(ctx, format, aq); \ printf_common(ctx, format, aq); \
} \ } \
int res = REAL(vname)(strp, __VA_ARGS__); \ int res = REAL(vname)(strp, __VA_ARGS__); \
if (res >= 0 && common_flags()->check_printf) { \ if (res >= 0) { \
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *strp, res + 1); \ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *strp, res + 1); \
} \ } \
VPRINTF_INTERCEPTOR_RETURN(); \ VPRINTF_INTERCEPTOR_RETURN(); \