summaryrefslogtreecommitdiffstats
path: root/Python/codecs.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2000-06-28 22:07:35 (GMT)
committerGuido van Rossum <guido@python.org>2000-06-28 22:07:35 (GMT)
commit582acece2e0db447904b3f8f8f1d2acf36834158 (patch)
tree80805422d52a32da77e5e93425c34ec48d76a9c6 /Python/codecs.c
parent6f2a5efec98c831bd529dfb341c2f83ff0914418 (diff)
downloadcpython-582acece2e0db447904b3f8f8f1d2acf36834158.zip
cpython-582acece2e0db447904b3f8f8f1d2acf36834158.tar.gz
cpython-582acece2e0db447904b3f8f8f1d2acf36834158.tar.bz2
Trent Mick's Win64 changes: size_t vs. int or long; also some overflow
tests.
Diffstat (limited to 'Python/codecs.c')
-rw-r--r--Python/codecs.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/Python/codecs.c b/Python/codecs.c
index 5e01cca..ceff376 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -83,11 +83,16 @@ static
PyObject *normalizestring(const char *string)
{
register int i;
- int len = strlen(string);
+ size_t len = strlen(string);
char *p;
PyObject *v;
- v = PyString_FromStringAndSize(NULL, len);
+ if (len > INT_MAX) {
+ PyErr_SetString(PyExc_OverflowError, "string is too large");
+ return NULL;
+ }
+
+ v = PyString_FromStringAndSize(NULL, (int)len);
if (v == NULL)
return NULL;
p = PyString_AS_STRING(v);