From c4bf4b7aefcd95b898ea9c8714d09fc1045f304c Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 15 May 2020 16:15:49 +0300 Subject: 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 --- include/my_dbug.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/my_dbug.h') 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); -- cgit v1.2.1