RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 29-Aug-2010 21:07:14
Branch: HEAD Handle: 2010082919071400
Modified files:
rpm CHANGES
rpm/rpmdb header.c
Log:
- rpmrepo: fix: don't segfault processing RPMv3 headers w/o digest.
Summary:
Revision Changes Path
1.3430 +2 -1 rpm/CHANGES
1.197 +2 -1 rpm/rpmdb/header.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3429 -r1.3430 CHANGES
--- rpm/CHANGES 29 Aug 2010 18:51:33 -0000 1.3429
+++ rpm/CHANGES 29 Aug 2010 19:07:14 -0000 1.3430
@@ -1,5 +1,6 @@
5.3.3 -> 5.4a1:
- - jbj: rpmrepo: rescusitate .olddata cleanup ff using sqlite from db-5.0.26.
+ - jbj: rpmrepo: fix: don't segfault processing RPMv3 headers w/o digest.
+ - jbj: rpmrepo: rescusitate .olddata cleanup iff using sqlite from db-5.0.26.
- jbj: rpmbin: install /usr/lib/rpm/bin/{sqlite3,dbsql} (both for now).
- jbj: tests: rescusitate: --with-file=external --with-dbsql=internal churn.
- jbj: permit --with-dbsql=internal as sqlite replacement.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.196 -r1.197 header.c
--- rpm/rpmdb/header.c 29 Jan 2010 21:02:31 -0000 1.196
+++ rpm/rpmdb/header.c 29 Aug 2010 19:07:14 -0000 1.197
@@ -1218,7 +1218,8 @@
{
if (h != NULL) {
h->digest = _free(h->digest);
- h->digest = xstrdup(digest);
+ if (digest)
+ h->digest = xstrdup(digest);
}
return 0;
}
@@ .
Received on Sun Aug 29 21:07:15 2010