mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
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().
This commit is contained in:
Tim Peters 2001-10-02 21:32:07 +00:00
parent 048eb75c2d
commit c15c4f1f39
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/stringobject.c
View file

@ -150,12 +150,17 @@ PyString_FromString(const char *str)
PyObject * PyObject *
PyString_FromFormatV(const char *format, va_list vargs) PyString_FromFormatV(const char *format, va_list vargs)
{ {
va_list count = vargs; va_list count;
int n = 0; int n = 0;
const char* f; const char* f;
char *s; char *s;
PyObject* string; 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 */ /* step 1: figure out how large a buffer we need */
for (f = format; *f; f++) { for (f = format; *f; f++) {
if (*f == '%') { if (*f == '%') {

2
Python/errors.c
View file

@ -407,7 +407,7 @@ PyErr_Format(PyObject *exception, const char *format, ...)
string = PyString_FromFormatV(format, vargs); string = PyString_FromFormatV(format, vargs);
PyErr_SetObject(exception, string); PyErr_SetObject(exception, string);
Py_XDECREF(string); Py_XDECREF(string);
va_end(vargs);
return NULL; return NULL;
} }