8.34 bump

This commit is contained in:
Petr Písař 2013-12-16 11:24:09 +01:00
parent 531a682ddb
commit a379af41ca
4 changed files with 7 additions and 57 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ pcre-8.10.tar.bz2
/pcre-8.32.tar.bz2
/pcre-8.33-RC1.tar.bz2
/pcre-8.33.tar.bz2
/pcre-8.34.tar.bz2

View File

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

View File

@ -1,8 +1,8 @@
# This is stable release:
#%%global rcversion RC1
Name: pcre
Version: 8.33
Release: %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist}
Version: 8.34
Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
%global myversion %{version}%{?rcversion:-%rcversion}
Summary: Perl-compatible regular expression library
Group: System Environment/Libraries
@ -121,6 +121,9 @@ make check
%{_mandir}/man1/pcretest.*
%changelog
* Mon Dec 16 2013 Petr Pisar <ppisar@redhat.com> - 8.34-1
- 8.34 bump
* Wed Oct 16 2013 Petr Pisar <ppisar@redhat.com> - 8.33-3
- Disable strict-aliasing on PPC64 (bug #881232)

View File

@ -1 +1 @@
21514018448ac10062ece7a668fca949 pcre-8.33.tar.bz2
5439e321351bddd5533551bbce128d07 pcre-8.34.tar.bz2