- Fix segfault in %{lua:...}'s rpm_print

- Don't automatically print a newline in rpm_print

1 files changed, 2 insertions, 3 deletions

diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.c
index a13f6c8c9..8f2c8c6b3 100644
--- a/rpmio/rpmlua.c
+++ b/rpmio/rpmlua.c
@@ -130,6 +130,7 @@ void rpmluaSetPrintBuffer(rpmlua _lua, int flag)
     free(lua->printbuf);
     lua->printbuf = NULL;
     lua->printbufsize = 0;
+    lua->printbufused = 0;
 }
 
 const char *rpmluaGetPrintBuffer(rpmlua _lua)
@@ -745,15 +746,13 @@ static int rpm_print (lua_State *L)
 	}
 	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;