71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
From 25ba46be7b2732a4e1fb272208d15c12807fd0ae Mon Sep 17 00:00:00 2001
|
|
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
|
Date: Sun, 25 Feb 2018 12:23:55 +0000
|
|
Subject: [PATCH] A small fix to pcregrep to avoid compiler warnings for
|
|
-Wformat-overflow=2.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1727 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
---
|
|
ChangeLog | 2 ++
|
|
pcregrep.c | 20 +++++++++++++++++---
|
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 5d1a4d9..a8cf378 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -49,6 +49,8 @@ containing multi-code-unit characters caused bad behaviour and possibly a
|
|
crash. This issue was fixed for other kinds of repeat in release 8.37 by change
|
|
38, but repeating character classes were overlooked.
|
|
|
|
+6. A small fix to pcregrep to avoid compiler warnings for -Wformat-overflow=2.
|
|
+
|
|
|
|
Version 8.41 05-July-2017
|
|
-------------------------
|
|
diff --git a/pcregrep.c b/pcregrep.c
|
|
index 69ba85a..a406be9 100644
|
|
--- a/pcregrep.c
|
|
+++ b/pcregrep.c
|
|
@@ -2527,7 +2527,14 @@ if ((popts & PO_FIXED_STRINGS) != 0)
|
|
}
|
|
}
|
|
|
|
-sprintf(buffer, "%s%.*s%s", prefix[popts], patlen, ps, suffix[popts]);
|
|
+if (snprintf(buffer, PATBUFSIZE, "%s%.*s%s", prefix[popts], patlen, ps,
|
|
+ suffix[popts]) > PATBUFSIZE)
|
|
+ {
|
|
+ fprintf(stderr, "pcregrep: Buffer overflow while compiling \"%s\"\n",
|
|
+ ps);
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
p->compiled = pcre_compile(buffer, options, &error, &errptr, pcretables);
|
|
if (p->compiled != NULL) return TRUE;
|
|
|
|
@@ -2763,8 +2770,15 @@ for (i = 1; i < argc; i++)
|
|
int arglen = (argequals == NULL || equals == NULL)?
|
|
(int)strlen(arg) : (int)(argequals - arg);
|
|
|
|
- sprintf(buff1, "%.*s", baselen, op->long_name);
|
|
- sprintf(buff2, "%s%.*s", buff1, fulllen - baselen - 2, opbra + 1);
|
|
+ if (snprintf(buff1, sizeof(buff1), "%.*s", baselen, op->long_name) >
|
|
+ (int)sizeof(buff1) ||
|
|
+ snprintf(buff2, sizeof(buff2), "%s%.*s", buff1,
|
|
+ fulllen - baselen - 2, opbra + 1) > (int)sizeof(buff2))
|
|
+ {
|
|
+ fprintf(stderr, "pcregrep: Buffer overflow when parsing %s option\n",
|
|
+ op->long_name);
|
|
+ pcregrep_exit(2);
|
|
+ }
|
|
|
|
if (strncmp(arg, buff1, arglen) == 0 ||
|
|
strncmp(arg, buff2, arglen) == 0)
|
|
--
|
|
2.13.6
|
|
|