From 546f704a2ccf490be3db9e60d19391e84b7bd784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 9 Dec 2016 09:01:03 +0100 Subject: [PATCH] Fix a memory leak and a typo in a documentation --- ...small-memory-leak-in-error-code-path.patch | 54 +++++++++++++++++++ pcre2.spec | 5 ++ 2 files changed, 59 insertions(+) create mode 100644 pcre2-10.22-Fix-small-memory-leak-in-error-code-path.patch diff --git a/pcre2-10.22-Fix-small-memory-leak-in-error-code-path.patch b/pcre2-10.22-Fix-small-memory-leak-in-error-code-path.patch new file mode 100644 index 0000000..e69e09c --- /dev/null +++ b/pcre2-10.22-Fix-small-memory-leak-in-error-code-path.patch @@ -0,0 +1,54 @@ +From 13d269bc77ecca631b4601d25365e65d3d4fe733 Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Thu, 8 Dec 2016 16:52:26 +0000 +Subject: [PATCH] Fix small memory leak in error code path. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Petr Pisar: Ported to 10.22: + +commit 5aaf9811e3fed9c86b39e3ecada0454240b7caae +Author: ph10 +Date: Thu Dec 8 16:52:26 2016 +0000 + + Fix small memory leak in error code path. + + git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@611 6239d852-aaf2-0410-a92c-79f79f948069 + +Signed-off-by: Petr Písař +--- + src/pcre2_compile.c | 4 ++-- + src/pcre2test.c | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c +index b9b9361..ed81639 100644 +--- a/src/pcre2_compile.c ++++ b/src/pcre2_compile.c +@@ -191,8 +191,8 @@ comparison). */ + locale, and may mark arbitrary characters as digits. We want to recognize only + 0-9, a-z, and A-Z as hex digits, which is why we have a private table here. It + costs 256 bytes, but it is a lot faster than doing character value tests (at +-least in some simple cases I timed), and in some applications one wants PCRE to +-compile efficiently as well as match efficiently. The value in the table is ++least in some simple cases I timed), and in some applications one wants PCRE2 ++to compile efficiently as well as match efficiently. The value in the table is + the binary hex digit value, or 0xff for non-hex digits. */ + + /* This is the "normal" case, for ASCII systems, and EBCDIC systems running in +diff --git a/src/pcre2test.c b/src/pcre2test.c +index 1844375..96d9075 100644 +--- a/src/pcre2test.c ++++ b/src/pcre2test.c +@@ -4411,6 +4411,7 @@ switch(cmd) + if (fread(serial, 1, serial_size, f) != serial_size) + { + fprintf(outfile, "** Wrong return from fread()\n"); ++ free(serial); + return PR_ABEND; + } + fclose(f); +-- +2.7.4 + diff --git a/pcre2.spec b/pcre2.spec index 1692201..410c59d 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -58,6 +58,9 @@ Patch11: pcre2-10.22-Fix-auto-anchor-bug-when-.-is-inside-an-assertion.patch # Fix pcre2-config --libs-posix output, in upstream after 10.22, # upstream bug #1924 Patch12: pcre2-10.22-Correct-libpcre2posix-typos-should-be-libpcre2-posix.patch +# Fix a memory leak and a typo in a documentation, in upstream after 10.22, +# upstream bug #1973 +Patch13: pcre2-10.22-Fix-small-memory-leak-in-error-code-path.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf BuildRequires: automake @@ -147,6 +150,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -245,6 +249,7 @@ make %{?_smp_mflags} check VERBOSE=yes %changelog * Fri Dec 09 2016 Petr Pisar - 10.22-7 - Fix pcre2-config --libs-posix output (upstream bug #1924) +- Fix a memory leak and a typo in a documentation (upstream bug #1973) * Tue Nov 08 2016 Petr Pisar - 10.22-6 - Fix faulty auto-anchoring patterns when .* is inside an assertion