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

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/posixmodule.c
View File

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