RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/build/ files.c pack.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sun 22 Jul 2007 - 07:28:59 CEST
Message-Id: <20070722052859.14E953484F4@rpm5.org>
  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:   22-Jul-2007 07:28:59
  Branch: HEAD                             Handle: 2007072206285800

  Modified files:
    rpm/build               files.c pack.c

  Log:
    plug more memory leaks.

  Summary:
    Revision    Changes     Path
    1.257       +3  -2      rpm/build/files.c
    2.215       +2  -0      rpm/build/pack.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  ============================================================================
  $ cvs diff -u -r1.256 -r1.257 files.c
  --- rpm/build/files.c	22 Jul 2007 04:55:38 -0000	1.256
  +++ rpm/build/files.c	22 Jul 2007 05:28:58 -0000	1.257
  @@ -1563,14 +1563,15 @@
       a = (char *)(fi->apath + fi->fc);
       *a = '\0';
   
  +    fi->actions = _free(fi->actions);			/* XXX memory leak */
       fi->actions = xcalloc(sizeof(*fi->actions), fi->fc);
       fi->fmapflags = xcalloc(sizeof(*fi->fmapflags), fi->fc);
       fi->astriplen = 0;
       if (fl->buildRootURL)
   	fi->astriplen = strlen(fl->buildRootURL);
       fi->striplen = 0;
  -    fi->fuser = NULL;
  -    fi->fgroup = NULL;
  +    fi->fuser = headerFreeData(fi->fuser, -1);		/* XXX memory leak */
  +    fi->fgroup = headerFreeData(fi->fgroup, -1);	/* XXX memory leak */
   
       /* Make the cpio list */
       if (fi->dil != NULL)	/* XXX can't happen */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  ============================================================================
  $ cvs diff -u -r2.214 -r2.215 pack.c
  --- rpm/build/pack.c	15 Jul 2007 16:32:16 -0000	2.214
  +++ rpm/build/pack.c	22 Jul 2007 05:28:58 -0000	2.215
  @@ -940,6 +940,7 @@
   	rc = writeRPM(&pkg->header, NULL, fn, RPMLEAD_BINARY,
   		    csa, spec->passPhrase, NULL);
   
  +	csa->cpioList->te = _free(csa->cpioList->te);	/* XXX memory leak */
   	csa->cpioList = rpmfiFree(csa->cpioList);
   	csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageBinaries)");
   	/*@=type@*/
  @@ -986,6 +987,7 @@
   	rc = writeRPM(&spec->sourceHeader, &spec->sourcePkgId, fn, RPMLEAD_SOURCE,
   		csa, spec->passPhrase, &(spec->cookie));
   
  +	csa->cpioList->te = _free(csa->cpioList->te);	/* XXX memory leak */
   	csa->cpioList = rpmfiFree(csa->cpioList);
   	csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageSources)");
   	/*@=type@*/
  @@ .
Received on Sun Jul 22 07:28:59 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.