Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Address issues brought up by MvL on python-checkins. 

I tested this with valgrind on amd64.

The man pages I found for diff architectures are inconsistent on this.
I'm not entirely sure this change is correct for all architectures either.

Perhaps we should just over-allocate and not worry about it?
This commit is contained in:
Neal Norwitz 2006-04-20 06:56:05 +00:00
parent 0d21b1ed54
commit 449b24ebe9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/posixmodule.c
View File

@ -6809,7 +6809,7 @@ posix_confstr(PyObject *self, PyObject *args)
{
PyObject *result = NULL;
int name;
char buffer[64];
char buffer[256];
if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) {
int len;
@ -6827,12 +6827,12 @@ posix_confstr(PyObject *self, PyObject *args)
}
else {
if ((unsigned int)len >= sizeof(buffer)) {
result = PyString_FromStringAndSize(NULL, len+1);
result = PyString_FromStringAndSize(NULL, len-1);
if (result != NULL)
confstr(name, PyString_AS_STRING(result), len+1);
confstr(name, PyString_AS_STRING(result), len);
}
else
result = PyString_FromString(buffer);
result = PyString_FromStringAndSize(buffer, len-1);
}
}
return result;