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 19:13:39
  Branch: rpm-4_5                          Handle: 2007082818133900

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/rpmio               macro.c

  Log:
    - backport macros.c from HEAD.

  Summary:
    Revision    Changes     Path
    1.1360.2.38 +1  -0      rpm/CHANGES
    2.117.2.3   +4  -5      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.37 -r1.1360.2.38 CHANGES
  --- rpm/CHANGES	28 Aug 2007 16:47:31 -0000	1.1360.2.37
  +++ rpm/CHANGES	28 Aug 2007 17:13:39 -0000	1.1360.2.38
  @@ -1,4 +1,5 @@
   4.4.9 -> 4.5:
  +    - jbj: backport macros.c from HEAD.
       - rpm.org: python: add method for expanding macros.
       - rpm.org: avoid truncating /var/log/rpmpkgs in case of errors (#232830).
       - jbj: update debugedit to include buildid changes.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.117.2.2 -r2.117.2.3 macro.c
  --- rpm/rpmio/macro.c	30 Jul 2007 02:45:12 -0000	2.117.2.2
  +++ rpm/rpmio/macro.c	28 Aug 2007 17:13:39 -0000	2.117.2.3
  @@ -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@*/
       
  @@ -604,7 +603,7 @@
   	/*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/
   	/*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
   {
  -    size_t bufn = _macro_BUFSIZ;
  +    size_t bufn = _macro_BUFSIZ + clen;
       char * buf = alloca(bufn);
       FILE *shf;
       int rc;
  @@ .