[packages/rpm.git] / do_not_write_before_macro_buffer.patch

diff -dur rpm-5.4.15.orig/rpmio/macro.c rpm-5.4.15/rpmio/macro.c
--- rpm-5.4.15.orig/rpmio/macro.c	2015-11-28 20:47:15.000000000 +0100
+++ rpm-5.4.15/rpmio/macro.c	2015-11-28 20:51:05.634724202 +0100
@@ -706,7 +706,9 @@
     FILE *shf;
     int rc;
     int c;
+    char * start;
 
+    start = mb->t;
     strncpy(buf, cmd, clen);
     buf[clen] = '\0';
     rc = expandU(mb, buf, bufn);
@@ -720,7 +722,7 @@
     (void) pclose(shf);
 
     /* XXX delete trailing \r \n */
-    while (iseol(mb->t[-1])) {
+    while (mb->t > start && iseol(mb->t[-1])) {
 	*(mb->t--) = '\0';
 	mb->nb++;
     }
Only in rpm-5.4.15/rpmio: macro.c~
Commit	Line	Data
7d0a808e JK	1	diff -dur rpm-5.4.15.orig/rpmio/macro.c rpm-5.4.15/rpmio/macro.c
	2	--- rpm-5.4.15.orig/rpmio/macro.c 2015-11-28 20:47:15.000000000 +0100
	3	+++ rpm-5.4.15/rpmio/macro.c 2015-11-28 20:51:05.634724202 +0100
	4	@@ -706,7 +706,9 @@
	5	FILE *shf;
	6	int rc;
	7	int c;
	8	+ char * start;
	9
	10	+ start = mb->t;
	11	strncpy(buf, cmd, clen);
	12	buf[clen] = '\0';
	13	rc = expandU(mb, buf, bufn);
	14	@@ -720,7 +722,7 @@
	15	(void) pclose(shf);
	16
	17	/* XXX delete trailing \r \n */
	18	- while (iseol(mb->t[-1])) {
	19	+ while (mb->t > start && iseol(mb->t[-1])) {
	20	*(mb->t--) = '\0';
	21	mb->nb++;
	22	}
	23	Only in rpm-5.4.15/rpmio: macro.c~