RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ rpmlua.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sat 03 Nov 2007 - 17:01:26 CET
Message-Id: <20071103160126.7EBA334847A@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:   03-Nov-2007 17:01:26
  Branch: HEAD                             Handle: 2007110316012600

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmlua.c

  Log:
    - rpm.org: fix segfault in %{lua: ...}'s rpm_print, no newline.

  Summary:
    Revision    Changes     Path
    1.1765      +1  -0      rpm/CHANGES
    2.25        +2  -3      rpm/rpmio/rpmlua.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1764 -r1.1765 CHANGES
  --- rpm/CHANGES	3 Nov 2007 15:38:18 -0000	1.1764
  +++ rpm/CHANGES	3 Nov 2007 16:01:26 -0000	1.1765
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rpm.org: fix segfault in %{lua: ...}'s rpm_print, no newline.
       - jbj: add lua/python getMacros bindings (mostly from <pjones@redhat.com>).
       - jbj: add a getter to retrieve macros with used and/or pattern filtering.
       - jbj: macro macro table/element internals opaque.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.c
  ============================================================================
  $ cvs diff -u -r2.24 -r2.25 rpmlua.c
  --- rpm/rpmio/rpmlua.c	3 Nov 2007 15:38:18 -0000	2.24
  +++ rpm/rpmio/rpmlua.c	3 Nov 2007 16:01:26 -0000	2.25
  @@ -172,6 +172,7 @@
       lua->storeprint = flag;
       lua->printbuf = _free(lua->printbuf);
       lua->printbufsize = 0;
  +    lua->printbufused = 0;
   }
   
   const char *rpmluaGetPrintBuffer(rpmlua _lua)
  @@ -878,15 +879,13 @@
   	}
   	lua_pop(L, 1);  /* pop result */
       }
  -    lua_pop(L, 1);
       if (!lua->storeprint) {
   	(void) fputs("\n", stdout);
       } else {
  -	if (lua->printbufused+1 >= lua->printbufsize) {
  +	if (lua->printbufused+1 > lua->printbufsize) {
   	    lua->printbufsize += 512;
   	    lua->printbuf = xrealloc(lua->printbuf, lua->printbufsize);
   	}
  -	lua->printbuf[lua->printbufused++] = '\n';
   	lua->printbuf[lua->printbufused] = '\0';
       }
       return 0;
  @@ .
Received on Sat Nov 3 17:01:26 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.