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

(Merge 3.4) Closes #21780: make the unicodedata module "ssize_t clean" for 

parsing parameters
This commit is contained in:
Victor Stinner 2014-07-01 16:46:12 +02:00
parent 7f084064e8 65a3144e54
commit da8e6a2dff
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/unicodedata.c
View File

@ -13,6 +13,8 @@
------------------------------------------------------------------------ */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "ucnhash.h"
#include "structmember.h"
@ -1271,12 +1273,16 @@ unicodedata_lookup(PyObject* self, PyObject* args)
Py_UCS4 code;
char* name;
int namelen;
Py_ssize_t namelen;
unsigned int index;
if (!PyArg_ParseTuple(args, "s#:lookup", &name, &namelen))
return NULL;
if (namelen > INT_MAX) {
PyErr_SetString(PyExc_KeyError, "name too long");
return NULL;
}
if (!_getcode(self, name, namelen, &code, 1)) {
if (!_getcode(self, name, (int)namelen, &code, 1)) {
PyErr_Format(PyExc_KeyError, "undefined character name '%s'", name);
return NULL;
}