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: 12-Sep-2011 16:26:24
Branch: rpm-5_4 Handle: 2011091214262300
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb hdrfmt.c
Log:
- hdrfmt: fix: remove a memory leak.
Summary:
Revision Changes Path
1.3501.2.169+1 -0 rpm/CHANGES
1.151.2.7 +3 -3 rpm/rpmdb/hdrfmt.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.168 -r1.3501.2.169 CHANGES
--- rpm/CHANGES 12 Sep 2011 14:16:54 -0000 1.3501.2.168
+++ rpm/CHANGES 12 Sep 2011 14:26:23 -0000 1.3501.2.169
@@ -1,4 +1,5 @@
5.4.2 -> 5.4.3:
+ - jbj: hdrfmt: fix: remove a memory leak.
- jbj: rpmgi: fix: load rpmdb tag value filters more carefully.
- devzero2000: add lzip support
- devzero2000: add lrzip support
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.151.2.6 -r1.151.2.7 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 5 Sep 2011 12:21:10 -0000 1.151.2.6
+++ rpm/rpmdb/hdrfmt.c 12 Sep 2011 14:26:23 -0000 1.151.2.7
@@ -2938,7 +2938,7 @@
Pevr = rpmEVRnew(PFlags, 1);
if (PEVRhe != NULL)
- xx = rpmEVRparse(xstrdup(PEVRhe->p.argv[PNhe->ix]), Pevr);
+ xx = rpmEVRparse(PEVRhe->p.argv[PNhe->ix], Pevr);
RNhe->tag = tagN;
REVRhe->tag = tagEVR;
@@ -3524,7 +3524,7 @@
if (EVR.argv != NULL && EVR.argv[i] != NULL && *EVR.argv[i] != '\0') {
uint32_t Fx = ((F.ui32p[i] >> 1) & 0x7);
EVR_t Revr = rpmEVRnew(Fx, 1);
- int xx = rpmEVRparse(xstrdup(EVR.argv[i]), Revr);
+ int xx = rpmEVRparse(EVR.argv[i], Revr);
const char * E = Revr->F[RPMEVR_E];
const char * V = Revr->F[RPMEVR_V];
const char * R = Revr->F[RPMEVR_R];
@@ -3571,7 +3571,7 @@
static const char *Fstr[] = {
"?0","LT","GT","?3","EQ","LE","GE","?7" };
uint32_t Fx = ((F.ui32p[i] >> 1) & 0x7);
EVR_t Revr = rpmEVRnew(Fx, 1);
- int xx = rpmEVRparse(xstrdup(EVR.argv[i]), Revr);
+ int xx = rpmEVRparse(EVR.argv[i], Revr);
const char * E = Revr->F[RPMEVR_E];
const char * V = Revr->F[RPMEVR_V];
const char * R = Revr->F[RPMEVR_R];
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
