RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 15-Oct-2007 18:19:01
Branch: HEAD Handle: 2007101517190001
Modified files:
rpm CHANGES
rpm/rpmdb header.c
Log:
- bandaid for a --import hge recursion problem. real fix soon.
Summary:
Revision Changes Path
1.1713 +1 -0 rpm/CHANGES
1.78 +4 -1 rpm/rpmdb/header.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1712 -r1.1713 CHANGES
--- rpm/CHANGES 15 Oct 2007 15:54:07 -0000 1.1712
+++ rpm/CHANGES 15 Oct 2007 16:19:00 -0000 1.1713
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: bandaid for a --import hge recursion problem. real fix soon.
- jbj: fix: missed a level of indirection.
- bero: Initialize arch and os in rpmtsAddInstallElement, fixing crash
when
installing a src.rpm
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.77 -r1.78 header.c
--- rpm/rpmdb/header.c 15 Oct 2007 15:54:08 -0000 1.77
+++ rpm/rpmdb/header.c 15 Oct 2007 16:19:01 -0000 1.78
@@ -1881,7 +1881,10 @@
break;
case RPM_I18NSTRING_TYPE:
case RPM_STRING_TYPE:
- nb = strlen(he_p.str) + 1;
+ if (he_p.str)
+ nb = strlen(he_p.str) + 1;
+ else
+ rc = 0;
break;
case RPM_STRING_ARRAY_TYPE:
break;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
