diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-04 22:53:19 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-04 22:53:19 (GMT) |
| commit | 9252287f2c9bc09fdc6bc729e13ac63935e4976e (patch) | |
| tree | 2593a9d4c32eff456f2229fcd5344e0ca85e6746 | |
| parent | 1b933ed50aef2c31e003a001cef8647244ebfa0e (diff) | |
| download | cpython-9252287f2c9bc09fdc6bc729e13ac63935e4976e.zip cpython-9252287f2c9bc09fdc6bc729e13ac63935e4976e.tar.gz cpython-9252287f2c9bc09fdc6bc729e13ac63935e4976e.tar.bz2 | |
Follow-up of #3773: In PyTokenizer_FindEncoding, remove the call to PyErr_NoMemory when PyMem_MALLOC() fails.
It is not stritly necessary, the function may already return NULL without an exception set,
for example when the file cannot be opened.
Discussed with Benjamin Peterson.
| -rw-r--r-- | Parser/tokenizer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index a040696..18815ae 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -1612,8 +1612,6 @@ PyTokenizer_FindEncoding(int fd) encoding = (char *)PyMem_MALLOC(strlen(tok->encoding) + 1); if (encoding) strcpy(encoding, tok->encoding); - else - PyErr_NoMemory(); } PyTokenizer_Free(tok); return encoding; |