RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 14:58:04 Branch: rpm-5_3 Handle: 2011070612580301 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/tools dbconvert.c Log: dbconvert: fix segfault when no root is specified. Summary: Revision Changes Path 1.3296.2.242+1 -0 rpm/CHANGES 2.1.4.6 +2 -2 rpm/tools/dbconvert.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3296.2.241 -r1.3296.2.242 CHANGES --- rpm/CHANGES 28 Jun 2011 12:31:11 -0000 1.3296.2.241 +++ rpm/CHANGES 6 Jul 2011 12:58:03 -0000 1.3296.2.242 @@ -1,4 +1,5 @@ 5.3.12 -> 5.3.13 + - proyvind: dbconvert: fix segfault when no root is specified. - devzero2000: merge afb patch portability of endian - proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. @@ . patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c ============================================================================ $ cvs diff -u -r2.1.4.5 -r2.1.4.6 dbconvert.c --- rpm/tools/dbconvert.c 28 Jun 2011 12:31:12 -0000 2.1.4.5 +++ rpm/tools/dbconvert.c 6 Jul 2011 12:58:04 -0000 2.1.4.6 @@ -82,7 +82,7 @@ addMacro(NULL, "__dbi_txn", NULL, "create mpool txn thread thread_count=64 nofsync", -1); /* (ugly) clear any existing locks */ - fn = rpmGetPath(prefix[0] ? prefix : "", dbpath, "/", "__db.*", NULL); + fn = rpmGetPath(prefix && prefix[0] ? prefix : "", dbpath, "/", "__db.*", NULL); xx = Glob(fn, 0, NULL, &gl); for (i = 0; i < (int)gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ -331,7 +331,7 @@ fn = _free(fn); /* clear locks */ - fn = rpmGetPath(prefix[0] ? prefix : "", dbpath, "/", "__db.*", NULL); + fn = rpmGetPath(prefix && prefix[0] ? prefix : "", dbpath, "/", "__db.*", NULL); xx = Glob(fn, 0, NULL, &gl); for (i = 0; i < (int)gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org