From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 14 Feb 2012 18:19:57 +0000 (+0000)
Subject: - added helperEVR-noassert patch (replace assert by error message;
X-Git-Tag: auto/th/rpm-5.4.10-0.5~45
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=c777b83048fb1614eb1820232dd843040baff838;ds=sidebyside

- added helperEVR-noassert patch (replace assert by error message;
  or maybe the build should fail in such case? but not in such pailfully way)

Changed files:
    rpm-helperEVR-noassert.patch -> 1.1
---

diff --git a/rpm-helperEVR-noassert.patch b/rpm-helperEVR-noassert.patch
new file mode 100644
index 0000000..fff4a84
--- /dev/null
+++ b/rpm-helperEVR-noassert.patch
@@ -0,0 +1,14 @@
+--- rpm-4.5/lib/rpmfc.c.orig	2012-02-13 20:28:52.564758176 +0100
++++ rpm-4.5/lib/rpmfc.c	2012-02-14 19:01:50.810809655 +0100
+@@ -472,7 +472,10 @@
+ 		}
+ 		i++;
+ 		EVR = pav[i];
+-assert(EVR != NULL);
++		if(EVR == NULL) {
++			rpmMessage(RPMMESS_ERROR, _("%s helper returned empty version info for %s, omitting\n"), nsdep, N);
++			continue;
++		}
+ 	    }
+ /*@=branchstate@*/
+