Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-04-28 09:36:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[common] fix gcc format-truncation false positive

Browse Source
This commit is contained in:
Geoffrey McRae 2021-02-22 01:39:28 +11:00
parent 28024de314
commit 99fc650550
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/common/stringutils.h
View File

@ -20,6 +20,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#ifndef _H_LG_COMMON_STRINGUTILS #ifndef _H_LG_COMMON_STRINGUTILS
#define _H_LG_COMMON_STRINGUTILS #define _H_LG_COMMON_STRINGUTILS
// vsprintf but with buffer allocation
int valloc_sprintf(char ** str, const char * format, va_list ap)
__attribute__ ((format (printf, 2, 0)));
// sprintf but with buffer allocation // sprintf but with buffer allocation
int alloc_sprintf(char ** str, const char * format, ...) int alloc_sprintf(char ** str, const char * format, ...)
__attribute__ ((format (printf, 2, 3))); __attribute__ ((format (printf, 2, 3)));

13
common/src/stringutils.c
View File

@ -21,7 +21,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
static int valloc_sprintf(char ** str, const char * format, va_list ap) int valloc_sprintf(char ** str, const char * format, va_list ap)
{ {
if (!str) if (!str)
return -1; return -1;
@ -30,13 +30,20 @@ static int valloc_sprintf(char ** str, const char * format, va_list ap)
va_list ap1; va_list ap1;
va_copy(ap1, ap); va_copy(ap1, ap);
int len = vsnprintf(NULL, 0, format, ap1);
// for some reason some versions of GCC warn about format being NULL when any
// kind of optimization is enabled, this is a false positive.
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-truncation"
const int len = vsnprintf(*str, 0, format, ap1);
#pragma GCC diagnostic pop
va_end(ap1); va_end(ap1);
if (len < 0) if (len < 0)
return len; return len;
*str = malloc(len+1); *str = malloc(len + 1);
int ret = vsnprintf(*str, len + 1, format, ap); int ret = vsnprintf(*str, len + 1, format, ap);
if (ret < 0) if (ret < 0)