diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-02 15:41:06 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-02 15:41:06 (GMT) |
| commit | 2247775bfa38f27aa3b36b7740cf2cec98356235 (patch) | |
| tree | 134572c5ae96bf41ae22c0a7b2a47820e775f447 | |
| parent | dba1b40b6064107d63f228fe67a258dd1123b189 (diff) | |
| parent | 984dfa7eed5a2c4673a5cc108f6bad1401e83440 (diff) | |
| download | cpython-2247775bfa38f27aa3b36b7740cf2cec98356235.zip cpython-2247775bfa38f27aa3b36b7740cf2cec98356235.tar.gz cpython-2247775bfa38f27aa3b36b7740cf2cec98356235.tar.bz2 | |
Merge with 3.2 (Issue #14471)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PC/winreg.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -56,6 +56,8 @@ Core and Builtins - Issue #14435: Remove dedicated block allocator from floatobject.c and rely on the PyObject_Malloc() api like all other objects. +- Issue #14471: Fix a possible buffer overrun in the winreg module. + Library ------- diff --git a/PC/winreg.c b/PC/winreg.c index 451ced2..3a5c8a6 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -1122,7 +1122,7 @@ PyEnumKey(PyObject *self, PyObject *args) * nul. RegEnumKeyEx requires a 257 character buffer to * retrieve such a key name. */ wchar_t tmpbuf[257]; - DWORD len = sizeof(tmpbuf); /* includes NULL terminator */ + DWORD len = sizeof(tmpbuf)/sizeof(wchar_t); /* includes NULL terminator */ if (!PyArg_ParseTuple(args, "Oi:EnumKey", &obKey, &index)) return NULL; |