Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly downcast from size_t/Py_ssize_t in a few places.

This commit is contained in:
Brian Curtin 2010-08-17 20:08:40 +00:00
parent 19467d27ff
commit abb3351785
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PC/winreg.c
View File

@ -765,8 +765,9 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
else {
if (!PyUnicode_Check(value))
return FALSE;
*retDataSize = 2 + PyUnicode_GET_DATA_SIZE(value);
*retDataSize = Py_SAFE_DOWNCAST(
2 + PyUnicode_GET_DATA_SIZE(value),
size_t, DWORD);
}
*retDataBuf = (BYTE *)PyMem_NEW(DWORD, *retDataSize);
if (*retDataBuf==NULL){
@ -798,7 +799,8 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
t = PyList_GET_ITEM(value, j);
if (!PyUnicode_Check(t))
return FALSE;
size += 2 + PyUnicode_GET_DATA_SIZE(t);
size += Py_SAFE_DOWNCAST(2 + PyUnicode_GET_DATA_SIZE(t),
size_t, DWORD);
}
*retDataSize = size + 2;
@ -848,7 +850,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
PyErr_NoMemory();
return FALSE;
}
*retDataSize = view.len;
*retDataSize = Py_SAFE_DOWNCAST(view.len, Py_ssize_t, DWORD);
memcpy(*retDataBuf, view.buf, view.len);
PyBuffer_Release(&view);
}