RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   18-Mar-2009 23:02:18
  Branch: rpm-5_1                          Handle: 2009031822021701

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmdb               header.c

  Log:
    - headerReload: fix: don't free the header blob.

  Summary:
    Revision    Changes     Path
    1.2288.2.211+1  -0      rpm/CHANGES
    1.153.2.8   +0  -2      rpm/rpmdb/header.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.210 -r1.2288.2.211 CHANGES
  --- rpm/CHANGES       18 Mar 2009 21:19:55 -0000      1.2288.2.210
  +++ rpm/CHANGES       18 Mar 2009 22:02:17 -0000      1.2288.2.211
  @@ -1,4 +1,5 @@
   5.1.7 -> 5.1.8:
  +    - jbj: headerReload: fix: don't free the header blob.
       - jbj: yarn: convert rpmte to a usage mutex (no refcounts).
       - jbj: yarn: convert rpmgi refcount to usage mutex.
       - jbj: yarn: use the pool changes where possible.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.153.2.7 -r1.153.2.8 header.c
  --- rpm/rpmdb/header.c        18 Mar 2009 19:29:52 -0000      1.153.2.7
  +++ rpm/rpmdb/header.c        18 Mar 2009 22:02:18 -0000      1.153.2.8
  @@ -1360,8 +1360,6 @@
        uh = _free(uh);
        return NULL;
       }
  -    if (nh->flags & HEADERFLAG_ALLOCATED)
  -     uh = _free(uh);
       nh->flags |= HEADERFLAG_ALLOCATED;
       if (ENTRY_IS_REGION(nh->index)) {
        if (tag == HEADER_SIGNATURES || tag == HEADER_IMMUTABLE)
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to