mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-10 22:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

reset errno before calling confstr - use confstr() doc to simplify checks afterwards

Browse source
This commit is contained in:
Skip Montanaro 2006-04-18 00:49:49 +00:00
parent 429433b30b
commit dd527fcbcd
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/posixmodule.c
View file

@ -6812,17 +6812,19 @@ posix_confstr(PyObject *self, PyObject *args)
char buffer[64]; char buffer[64];
if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) { if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) {
int len = confstr(name, buffer, sizeof(buffer)); int len;
errno = 0; errno = 0;
if (len == 0) { len = confstr(name, buffer, sizeof(buffer));
if (errno != 0)
if (len == -1) {
posix_error(); posix_error();
else }
else if (len == 0) {
result = PyString_FromString(""); result = PyString_FromString("");
} }
else { else {
if (len >= sizeof(buffer)) { if ((unsigned int)len >= sizeof(buffer)) {
result = PyString_FromStringAndSize(NULL, len); result = PyString_FromStringAndSize(NULL, len);
if (result != NULL) if (result != NULL)
confstr(name, PyString_AS_STRING(result), len+1); confstr(name, PyString_AS_STRING(result), len+1);