languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-06 13:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

PyEnumKey(): Stop including the trailing NUL byte

Browse source 
in the returned string (logic error introduced by
recent patch).
This commit is contained in:
Tim Peters 2006-02-19 04:05:39 +00:00
parent d9ab979f36
commit 313fcd41ab
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
PC/_winreg.c
View file

@ -832,9 +832,9 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
void *src_buf;
PyBufferProcs *pb = value->ob_type->tp_as_buffer;
if (pb==NULL) {
PyErr_Format(PyExc_TypeError,
PyErr_Format(PyExc_TypeError,
"Objects of type '%s' can not "
"be used as binary registry values",
"be used as binary registry values",
value->ob_type->tp_name);
return FALSE;
}
@ -1039,14 +1039,13 @@ PyEnumKey(PyObject *self, PyObject *args)
return NULL;
if (!PyHKEY_AsHKEY(obKey, &hKey, FALSE))
return NULL;
Py_BEGIN_ALLOW_THREADS
rc = RegEnumKeyEx(hKey, index, tmpbuf, &len, NULL, NULL, NULL, NULL);
Py_END_ALLOW_THREADS
if (rc != ERROR_SUCCESS)
return PyErr_SetFromWindowsErrWithFunction(rc, "RegEnumKeyEx");
++len; /* include null terminator */
retStr = PyString_FromStringAndSize(tmpbuf, len);
return retStr; /* can be NULL */
}