SF bug [#467265] Compile errors on SuSe Linux on IBM/s390.

tim-one · tim-one · commit c15c4f1f39b2 · 2001-10-02T21:32:07.000Z
Unknown whether this fixes it.
- stringobject.c, PyString_FromFormatV:  don't assume that va_list is of
  a type that can be copied via an initializer.
- errors.c, PyErr_Format:  add a va_end() to balance the va_start().
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
@@ -150,12 +150,17 @@ PyString_FromString(const char *str)
 PyObject *
 PyString_FromFormatV(const char *format, va_list vargs)
 {
-	va_list count = vargs;
+	va_list count;
 	int n = 0;
 	const char* f;
 	char *s;
 	PyObject* string;
 
+#ifdef VA_LIST_IS_ARRAY
+	memcpy(count, vargs, sizeof(va_list));
+#else
+	count = vargs;
+#endif
 	/* step 1: figure out how large a buffer we need */
 	for (f = format; *f; f++) {
 		if (*f == '%') {
diff --git a/Python/errors.c b/Python/errors.c
@@ -407,7 +407,7 @@ PyErr_Format(PyObject *exception, const char *format, ...)
 	string = PyString_FromFormatV(format, vargs);
 	PyErr_SetObject(exception, string);
 	Py_XDECREF(string);
-	
+	va_end(vargs);
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ PyErr_Format(PyObject exception, const char format, ...)`
`407`	`407`	`string = PyString_FromFormatV(format, vargs);`
`408`	`408`	`PyErr_SetObject(exception, string);`
`409`	`409`	`Py_XDECREF(string);`
`410`		`-`
	`410`	`+ va_end(vargs);`
`411`	`411`	`return NULL;`
`412`	`412`	`}`
`413`	`413`