From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 14 Aug 2015 04:52:56 +0000 (-0700)
Subject: add missing NULL checks to get_coding_spec (closes #24854)
X-Git-Tag: v2.7.11rc1~198^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=223546d55cddf0e1c52e114201747ab154216fd4;p=thirdparty%2FPython%2Fcpython.git

add missing NULL checks to get_coding_spec (closes #24854)
---

diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index d0e4a0e2745a..109c0eee9283 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -235,7 +235,10 @@ get_coding_spec(const char *s, Py_ssize_t size)
 
             if (begin < t) {
                 char* r = new_string(begin, t - begin);
-                char* q = get_normal_name(r);
+                char* q;
+                if (!r)
+                    return NULL;
+                q = get_normal_name(r);
                 if (r != q) {
                     PyMem_FREE(r);
                     r = new_string(q, strlen(q));