AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests-mbwc: Silence gcc 14 -Werror=format-overflow=

Browse Source 
With gcc 14, I get this warning/werror when building the localedata tests:
tests-mbwc/tsp_common.c: In function ‘result.constprop.isra’:
tests-mbwc/tsp_common.c:55:43: error: ‘%s’ directive writing up to 92 bytes into a region of size between 0 and 114 [-Werror=format-overflow=]
   55 |   sprintf (result_rec, "%s:%s:%d:%d:%d:%c:%s\n", func, loc, rec_no, seq_no,
      |                                           ^~
In file included from ../include/bits/stdio2.h:1,
                 from ../libio/stdio.h:980,
                 from ../include/stdio.h:14,
                 from tests-mbwc/tsp_common.c:10:
In function ‘sprintf’,
    inlined from ‘result.constprop.isra’ at tests-mbwc/tsp_common.c:55:3:
../libio/bits/stdio2.h:30:10: note: ‘__builtin___sprintf_chk’ output between 20 and 234 bytes into a destination of size 132
   30 |   return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   31 |                                   __glibc_objsize (__s), __fmt,
      |                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   32 |                                   __va_arg_pack ());
      |                                   ~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

This patch now gets rid of using sprintf and the result_rec buffer and just
prints to fp directly.
This commit is contained in:
Stefan Liebler 2024-06-27 13:42:37 +02:00
parent 21738846a1
commit c0f21e073d
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
localedata/tests-mbwc/tsp_common.c
View File

@ -35,30 +35,16 @@ main (int argc, char *argv[])
return (ret != 0); return (ret != 0);
} }
#define MAX_RESULT_REC 132
char result_rec[MAX_RESULT_REC];
int int
result (FILE * fp, char res, const char *func, const char *loc, int rec_no, result (FILE * fp, char res, const char *func, const char *loc, int rec_no,
int seq_no, int case_no, const char *msg) int seq_no, int case_no, const char *msg)
{ {
if (fp == NULL if (fp == NULL)
|| strlen (func) + strlen (loc) + strlen (msg) + 32 > MAX_RESULT_REC) fp = stderr;
{
fprintf (stderr,
"Warning: result(): can't write the result: %s:%s:%d:%d:%s\n",
func, loc, rec_no, case_no, msg);
return 0;
}
sprintf (result_rec, "%s:%s:%d:%d:%d:%c:%s\n", func, loc, rec_no, seq_no, if (fprintf (fp, "%s:%s:%d:%d:%d:%c:%s\n", func, loc, rec_no, seq_no,
case_no, res, msg); case_no, res, msg) == EOF)
return 0;
if (fputs (result_rec, fp) == EOF)
{
return 0;
}
return 1; return 1;
} }