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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   26-Oct-2007 06:00:52
  Branch: HEAD                             Handle: 2007102605005101

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               hdrfmt.c
    rpm/rpmio               rpmpgp.c

  Log:
    - jbj: trade a double free for a modest memory leak for the moment.
    - jbj: fix: install modes broken by forgetting to add '\0'.

  Summary:
    Revision    Changes     Path
    1.1757      +2  -0      rpm/CHANGES
    1.26        +1  -0      rpm/rpmdb/hdrfmt.c
    2.63        +2  -0      rpm/rpmio/rpmpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1756 -r1.1757 CHANGES
  --- rpm/CHANGES	26 Oct 2007 02:50:46 -0000	1.1756
  +++ rpm/CHANGES	26 Oct 2007 04:00:51 -0000	1.1757
  @@ -1,4 +1,6 @@
   4.5 -> 5.0:
  +    - jbj: trade a double free for a modest memory leak for the moment.
  +    - jbj: fix: install modes broken by forgetting to add '\0'.
       - jbj: mostly unbork HEAD. --install modes still non-functional.
       - jbj: don't modify strings exposed by method wrappers (#349091).
       - jbj: drill headerAddExtension everywhere.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c	26 Oct 2007 02:50:46 -0000	1.25
  +++ rpm/rpmdb/hdrfmt.c	26 Oct 2007 04:00:52 -0000	1.26
  @@ -1305,6 +1305,7 @@
   	(void) urlPath(dirNames.argv[dirIndexes.i32p[i]], &dn);
   	fileNames.argv[i] = t;
   	t = stpcpy( stpcpy(t, dn), baseNames.argv[i]);
  +	*t++ = '\0';
       }
       baseNames.ptr = headerFreeData(baseNames.ptr, bnt);
       dirNames.ptr = headerFreeData(dirNames.ptr, dnt);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  ============================================================================
  $ cvs diff -u -r2.62 -r2.63 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c	13 Oct 2007 08:42:08 -0000	2.62
  +++ rpm/rpmio/rpmpgp.c	26 Oct 2007 04:00:52 -0000	2.63
  @@ -1151,8 +1151,10 @@
   	int32_t sigtag, int32_t sigtype, const void * sig, int32_t siglen)
   {
       if (dig != NULL) {
  +#if 0
   	if (dig->sig)
   	    dig->sig = _free(dig->sig);
  +#endif
   	dig->sigtag = sigtag;
   	dig->sigtype = (sig ? sigtype : 0);
   /*@-assignexpose -kepttrans@*/
  @@ .