RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/rpmio/ macro.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Tue 28 Aug 2007 - 01:18:44 CEST
Message-Id: <20070827231844.373B134845B@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:   28-Aug-2007 01:18:44
  Branch: HEAD                             Handle: 2007082800184400

  Modified files:
    rpm/rpmio               macro.c

  Log:
    avoid fixed size buffer.

  Summary:
    Revision    Changes     Path
    2.143       +3  -4      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.142 -r2.143 macro.c
  --- rpm/rpmio/macro.c	27 Aug 2007 19:26:52 -0000	2.142
  +++ rpm/rpmio/macro.c	27 Aug 2007 23:18:44 -0000	2.143
  @@ -261,7 +261,6 @@
   	/*@*/
   {
       MacroEntry key, *ret;
  -    char namebuf[1024];
   
   /*@-globs@*/
       if (mc == NULL) mc = rpmGlobalMacroContext;
  @@ -271,9 +270,9 @@
   
   /*@-branchstate@*/
       if (namelen > 0) {
  -	strncpy(namebuf, name, namelen);
  -	namebuf[namelen] = '\0';
  -	name = namebuf;
  +	char * t = strncpy(alloca(namelen + 1), name, namelen);
  +	t[namelen] = '\0';
  +	name = t;
       }
   /*@=branchstate@*/
       
  @@ .
Received on Tue Aug 28 01:18:44 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.