Fix _Py_normalize_encoding(): ensure that buffer is big enough to store "utf-8"

vstinner · vstinner · commit df23e30bea27 · 2013-11-07T13:33:36.000+01:00
if the input string is NULL
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -2983,6 +2983,8 @@ _Py_normalize_encoding(const char *encoding,
     char *l_end;
 
     if (encoding == NULL) {
+        if (lower_len < 6)
+            return 0;
         strcpy(lower, "utf-8");
         return 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -2983,6 +2983,8 @@ _Py_normalize_encoding(const char *encoding,`
`2983`	`2983`	`char *l_end;`
`2984`	`2984`
`2985`	`2985`	`if (encoding == NULL) {`
	`2986`	`+ if (lower_len < 6)`
	`2987`	`+ return 0;`
`2986`	`2988`	`strcpy(lower, "utf-8");`
`2987`	`2989`	`return 1;`
`2988`	`2990`	`}`