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:   27-Jul-2011 20:02:02
  Branch: rpm-5_4                          Handle: 2011072718020200

  Modified files:           (Branch: rpm-5_4)
    rpm/tools               dbconvert.c

  Log:
    add a missing null pointer check

  Summary:
    Revision    Changes     Path
    2.1.2.10    +1  -1      rpm/tools/dbconvert.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tools/dbconvert.c
  ============================================================================
  $ cvs diff -u -r2.1.2.9 -r2.1.2.10 dbconvert.c
  --- rpm/tools/dbconvert.c     27 Jul 2011 17:58:12 -0000      2.1.2.9
  +++ rpm/tools/dbconvert.c     27 Jul 2011 18:02:02 -0000      2.1.2.10
  @@ -332,7 +332,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

Reply via email to