Attachment #57895 for bug #87310

View | Details | Raw Unified | Return to bug 87310
Collapse All | Expand All

Lines 6-13 Link Here

(-)str/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= str	8	PORTNAME= str
9	PORTVERSION= 0.9.11	9	PORTVERSION= 0.9.12
10	PORTREVISION= 1
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_OSSP}	11	MASTER_SITES= ${MASTER_SITE_OSSP}
13	MASTER_SITE_SUBDIR= lib/${PORTNAME}	12	MASTER_SITE_SUBDIR= lib/${PORTNAME}

Lines 1-2 Link Here

(-)str/distinfo (-2 / +2 lines)
1	MD5 (str-0.9.11.tar.gz) = e9ff9178f8532ff7237c8cd6b4508ad7	1	MD5 (str-0.9.12.tar.gz) = 3f6da8a6ae6662eedf481f11a65592b2
2	SIZE (str-0.9.11.tar.gz) = 383023	2	SIZE (str-0.9.12.tar.gz) = 365034




--- str_parse.c.orig	Mon Jan 24 13:20:22 2005
+++ str_parse.c	Tue Oct 11 13:44:59 2005
@@ -297,6 +297,7 @@
     char buf2[128];
     char *buf_ptr;
     str_vformat_t sf;
+    va_list ap_temp;
 
     /*
      * Caching support
@@ -564,7 +565,9 @@
         sf.data[3].p = (char *)string;
         sf.data[4].p = cap_vec;
         sf.data[5].i = cap_num;
-        l = str_vformat(&sf, buf_ptr, ap);
+        /* we shall need `ap' untouched later */
+        va_copy(ap_temp, ap);
+        l = str_vformat(&sf, buf_ptr, ap_temp);
 
         /* allocate output buffer */
         if ((*cpp = (char *)malloc(l+1)) == NULL) {

Return to bug 87310

Lines 1-21 Link Here

(-)str/files/patch-str_parse.c (-21 lines)
1	--- str_parse.c.orig Mon Jan 24 13:20:22 2005
2	+++ str_parse.c Tue Oct 11 13:44:59 2005
3	@@ -297,6 +297,7 @@
4	char buf2[128];
5	char *buf_ptr;
6	str_vformat_t sf;
7	+ va_list ap_temp;
8
9	/*
10	* Caching support
11	@@ -564,7 +565,9 @@
12	sf.data[3].p = (char *)string;
13	sf.data[4].p = cap_vec;
14	sf.data[5].i = cap_num;
15	- l = str_vformat(&sf, buf_ptr, ap);
16	+ /* we shall need `ap' untouched later */
17	+ va_copy(ap_temp, ap);
18	+ l = str_vformat(&sf, buf_ptr, ap_temp);
19
20	/* allocate output buffer */
21	if ((cpp = (char )malloc(l+1)) == NULL) {