diff options
| author | Monty <monty@mariadb.org> | 2020-05-15 16:15:49 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-05-23 12:29:10 +0300 |
| commit | c4bf4b7aefcd95b898ea9c8714d09fc1045f304c (patch) | |
| tree | f45c4aefb9e22ecadf8e2e8ac19d0673c88a8e69 /include/my_dbug.h | |
| parent | dcc0baf5405b220384b9e1e07d8b9e3ff97b60f4 (diff) | |
| download | mariadb-git-c4bf4b7aefcd95b898ea9c8714d09fc1045f304c.tar.gz | |
Fixed access to undefined memory found by valgrind and MSAN
When my_vsnprintf() is patched, the code protected disabled with
'WAITING_FOR_BUGFIX_TO_VSPRINTF' should be enabled again. Also all %b
formats in this patch should be revert to %s again
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index 09ccb6102fc..f0c74ab485c 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -52,7 +52,10 @@ extern void _db_enter_(const char *_func_, const char *_file_, uint _line_, extern void _db_return_(struct _db_stack_frame_ *_stack_frame_); extern int _db_pargs_(uint _line_,const char *keyword); extern void _db_doprnt_(const char *format,...) - ATTRIBUTE_FORMAT(printf, 1, 2); +#ifdef WAITING_FOR_BUGFIX_TO_VSPRINTF + ATTRIBUTE_FORMAT(printf, 1, 2) +#endif + ; extern void _db_dump_(uint _line_,const char *keyword, const unsigned char *memory, size_t length); extern void _db_end_(void); |