- merger changes from rpm-4_5 branch @ PLD

[packages/rpm.git] / rpm-helperEVR-noassert.patch

diff --git a/rpm-helperEVR-noassert.patch b/rpm-helperEVR-noassert.patch
new file mode 100644 (file)
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@*/
+