From: Michael Meffie Date: Mon, 19 Feb 2018 18:57:16 +0000 (-0500) Subject: butc: fix format overflow warning X-Git-Tag: upstream/1.8.1_pre2^2~64 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=dba69c2a190103d1941ca6232d9a466f259a206c;p=packages%2Fo%2Fopenafs.git butc: fix format overflow warning Recent versions of gcc generate an overflow warning in the butc DUMPNAME macro when copying values into the finishedMsg1 buffer. Increase the size of the destination buffer to avoid a possible buffer overflow. dump.c:88:24: error: ‘%s’ directive writing up to 63 bytes into a region of size 50 [-Werror=format-overflow=] sprintf(dumpname, "%s (DumpId %u)", name, dbDumpId); ^ dump.c:1294:5: note: in expansion of macro ‘DUMPNAME’ DUMPNAME(finishedMsg1, nodePtr->dumpSetName, dparams.databaseDumpId); ^~~~~~~~ dump.c:88:6: note: ‘sprintf’ output between 12 and 84 bytes into a destination of size 50 sprintf(dumpname, "%s (DumpId %u)", name, dbDumpId); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dump.c:1294:5: note: in expansion of macro ‘DUMPNAME’ DUMPNAME(finishedMsg1, nodePtr->dumpSetName, dparams.databaseDumpId); ^~~~~~~~ Reviewed-on: https://gerrit.openafs.org/12916 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk (cherry picked from commit cec45d59440f55316097cfd6652d2ea26cd55233) Change-Id: I9f3b284d4a32b868091986964af128ed9b3557fd Reviewed-on: https://gerrit.openafs.org/13097 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- diff --git a/src/butc/dump.c b/src/butc/dump.c index cd5d59193..28d69cf34 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -1116,7 +1116,7 @@ Dumper(void *param) int nodumpvolumes = 0; char strlevel[5]; char msg[20]; - char finishedMsg1[50]; + char finishedMsg1[128]; char finishedMsg2[50]; time_t startTime = 0; time_t endTime = 0;