[packages/xz] - rel 2; realloc patch from git

[arekm]

commit 75b7e3b3b893e80b63e1438a06bfd9f11704a475
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Nov 15 14:35:57 2012 +0100

    - rel 2; realloc patch from git

 xz-realloc.patch | 39 +++++++++++++++++++++++++++++++++++++++
 xz.spec          |  4 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/xz.spec b/xz.spec
index c61fa66..55ceab8 100644
--- a/xz.spec
+++ b/xz.spec
@@ -18,13 +18,14 @@ Summary:	LZMA Encoder/Decoder
 Summary(pl.UTF-8):	Koder/Dekoder LZMA
 Name:		xz
 Version:	5.1.2
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL v2.1+, helper scripts on GPL v2+
 Group:		Applications/Archiving
 Source0:	http://tukaani.org/xz/%{name}-%{version}alpha.tar.gz
 # Source0-md5:	9bad1e249537ce69b206815cf28ca87b
 Patch0:		%{name}-parallel.patch
+Patch1:		%{name}-realloc.patch
 URL:		http://tukaani.org/xz/
 %{?with_asm:BuildRequires:	gcc >= 5:3.4}
 BuildRequires:	rpm >= 4.4.9-56
@@ -117,6 +118,7 @@ Biblioteka statyczna LZMA.
 %prep
 %setup -q -n %{name}-%{version}alpha
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
diff --git a/xz-realloc.patch b/xz-realloc.patch
new file mode 100644
index 0000000..586a375
--- /dev/null
+++ b/xz-realloc.patch
@@ -0,0 +1,39 @@
+From 3d93b6354927247a1569caf22ad27b07e97ee904 Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin at tukaani.org>
+Date: Fri, 28 Sep 2012 20:11:09 +0300
+Subject: [PATCH] xz: Improve handling of failed realloc in xrealloc.
+
+Thanks to Jim Meyering.
+---
+ src/xz/util.c |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/xz/util.c b/src/xz/util.c
+index 987b443..35850f4 100644
+--- a/src/xz/util.c
++++ b/src/xz/util.c
+@@ -26,9 +26,19 @@ xrealloc(void *ptr, size_t size)
+ {
+ 	assert(size > 0);
+ 
++	// Save ptr so that we can free it if realloc fails.
++	// The point is that message_fatal ends up calling stdio functions
++	// which in some libc implementations might allocate memory from
++	// the heap. Freeing ptr improves the chances that there's free
++	// memory for stdio functions if they need it.
++	void *p = ptr;
+ 	ptr = realloc(ptr, size);
+-	if (ptr == NULL)
+-		message_fatal("%s", strerror(errno));
++
++	if (ptr == NULL) {
++		const int saved_errno = errno;
++		free(p);
++		message_fatal("%s", strerror(saved_errno));
++	}
+ 
+ 	return ptr;
+ }
+-- 
+1.7.6
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xz.git/commitdiff/75b7e3b3b893e80b63e1438a06bfd9f11704a475