summaryrefslogtreecommitdiffstats
path: root/Parser
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-09-04 22:34:09 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-09-04 22:34:09 (GMT)
commit1b933ed50aef2c31e003a001cef8647244ebfa0e (patch)
tree1d434753b2e2fd9e1454f4bd614c73a90bab903f /Parser
parent1d6a16bf3838bfb89efdd5e338b247324d962010 (diff)
downloadcpython-1b933ed50aef2c31e003a001cef8647244ebfa0e.zip
cpython-1b933ed50aef2c31e003a001cef8647244ebfa0e.tar.gz
cpython-1b933ed50aef2c31e003a001cef8647244ebfa0e.tar.bz2
#3773: Check for errors around the use of PyTokenizer_FindEncoding().
reviewed by Brett Cannon.
Diffstat (limited to 'Parser')
-rw-r--r--Parser/tokenizer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index e4cf8e4..a040696 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -1610,7 +1610,10 @@ PyTokenizer_FindEncoding(int fd)
fclose(fp);
if (tok->encoding) {
encoding = (char *)PyMem_MALLOC(strlen(tok->encoding) + 1);
- strcpy(encoding, tok->encoding);
+ if (encoding)
+ strcpy(encoding, tok->encoding);
+ else
+ PyErr_NoMemory();
}
PyTokenizer_Free(tok);
return encoding;