diff options
| author |   Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-02 15:41:06 +0000 |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-04-02 15:41:06 +0000 |
| commit | 2247775bfa38f27aa3b36b7740cf2cec98356235 (patch) | |
| tree | 134572c5ae96bf41ae22c0a7b2a47820e775f447 /PC | |
| parent | merge 3.2 (diff) | |
| parent | Issue #14471: Fix a possible buffer overrun in the winreg module. (diff) | |
| download | cpython-2247775bfa38f27aa3b36b7740cf2cec98356235.tar.gz cpython-2247775bfa38f27aa3b36b7740cf2cec98356235.tar.bz2 cpython-2247775bfa38f27aa3b36b7740cf2cec98356235.zip | |
Merge with 3.2 (Issue #14471)
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/winreg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/PC/winreg.c b/PC/winreg.c index 451ced29ee3..3a5c8a6a420 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; |