rpms/pcre
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix possible pcretest crash with a data line longer than 65536 bytes

Browse Source
This commit is contained in:
Petr Písař 2013-05-13 14:36:39 +02:00
parent 81e9d1cee3
commit 1d38ecba21
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pcre-8.33-RC1-Fix-pcretest-crash-with-a-data-line-longer-than-6553.patch Normal file
View File

@ -0,0 +1,54 @@
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

4
pcre.spec
View File

@ -17,6 +17,8 @@ Patch1: pcre-8.32-refused_spelling_terminated.patch
Patch2: pcre-8.33-RC1-Fix-retrieving-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch Patch2: pcre-8.33-RC1-Fix-retrieving-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch
# Fix pcregrep on empty line, in upstream after 8.33-RC1 # Fix pcregrep on empty line, in upstream after 8.33-RC1
Patch3: pcre-8.33-RC1-Fix-pcregrep-so-that-it-can-find-empty-lines.patch Patch3: pcre-8.33-RC1-Fix-pcregrep-so-that-it-can-find-empty-lines.patch
# Grow buffer in pcretest properly, in upstream after 8.33-RC1
Patch4: pcre-8.33-RC1-Fix-pcretest-crash-with-a-data-line-longer-than-6553.patch
BuildRequires: readline-devel BuildRequires: readline-devel
# New libtool to get rid of rpath # New libtool to get rid of rpath
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
@ -60,6 +62,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
%patch1 -p1 -b .terminated_typos %patch1 -p1 -b .terminated_typos
%patch2 -p1 -b .fullinfo %patch2 -p1 -b .fullinfo
%patch3 -p1 -b .pcregrep_empty_line %patch3 -p1 -b .pcregrep_empty_line
%patch4 -p1 -b .pcretest_grow_buffer
# Because of rpath patch # Because of rpath patch
libtoolize --copy --force && autoreconf -vif libtoolize --copy --force && autoreconf -vif
# One contributor's name is non-UTF-8 # One contributor's name is non-UTF-8
@ -125,6 +128,7 @@ make check
%changelog %changelog
* Mon May 13 2013 Petr Pisar <ppisar@redhat.com> - 8.33-0.2.RC1 * Mon May 13 2013 Petr Pisar <ppisar@redhat.com> - 8.33-0.2.RC1
- Fix bad handling of empty lines in pcregrep tool (bug #961789) - Fix bad handling of empty lines in pcregrep tool (bug #961789)
- Fix possible pcretest crash with a data line longer than 65536 bytes
* Thu May 02 2013 Petr Pisar <ppisar@redhat.com> - 8.33-0.1.RC1 * Thu May 02 2013 Petr Pisar <ppisar@redhat.com> - 8.33-0.1.RC1
- 8.33-RC1 bump - 8.33-RC1 bump