55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From bf2c63fda75cca4ab3006b6ccdf0f18fafe4fca5 Mon Sep 17 00:00:00 2001
|
|
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
|
Date: Fri, 10 May 2013 16:22:40 +0000
|
|
Subject: [PATCH] Fix pcretest crash with a data line longer than 65536 bytes.
|
|
|
|
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1327 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
|
|
|
Petr Pisar: Port to 8.31-RC1
|
|
|
|
diff --git a/pcretest.c b/pcretest.c
|
|
index 6ef3252..25f3853 100644
|
|
--- a/pcretest.c
|
|
+++ b/pcretest.c
|
|
@@ -4411,7 +4411,8 @@ while (!done)
|
|
|
|
#ifndef NOUTF
|
|
/* Check that the data is well-formed UTF-8 if we're in UTF mode. To create
|
|
- invalid input to pcre_exec, you must use \x?? or \x{} sequences. */
|
|
+ invalid input to pcre_exec, you must use \x?? or \x{} sequences. */
|
|
+
|
|
if (use_utf)
|
|
{
|
|
pcre_uint8 *q;
|
|
@@ -4429,21 +4430,23 @@ while (!done)
|
|
|
|
#ifdef SUPPORT_VALGRIND
|
|
/* Mark the dbuffer as addressable but undefined again. */
|
|
+
|
|
if (dbuffer != NULL)
|
|
{
|
|
VALGRIND_MAKE_MEM_UNDEFINED(dbuffer, dbuffer_size * CHAR_SIZE);
|
|
}
|
|
#endif
|
|
|
|
- /* Allocate a buffer to hold the data line. len+1 is an upper bound on
|
|
- the number of pcre_uchar units that will be needed. */
|
|
- if (dbuffer == NULL || (size_t)len >= dbuffer_size)
|
|
+ /* Allocate a buffer to hold the data line; len+1 is an upper bound on
|
|
+ the number of pcre_uchar units that will be needed. */
|
|
+
|
|
+ while (dbuffer == NULL || (size_t)len >= dbuffer_size)
|
|
{
|
|
dbuffer_size *= 2;
|
|
dbuffer = (pcre_uint8 *)realloc(dbuffer, dbuffer_size * CHAR_SIZE);
|
|
if (dbuffer == NULL)
|
|
{
|
|
- fprintf(stderr, "pcretest: malloc(%d) failed\n", (int)dbuffer_size);
|
|
+ fprintf(stderr, "pcretest: realloc(%d) failed\n", (int)dbuffer_size);
|
|
exit(1);
|
|
}
|
|
}
|
|
--
|
|
1.8.1.4
|
|
|