From: Guido van Rossum <guido@python.org>
Date: Thu, 1 Oct 1998 15:24:50 +0000 (+0000)
Subject: While scalling sys.modules, skip entries that don't have string keys,
X-Git-Tag: v1.5.2a2~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=566373e974413de66ad1d627f322908597eb2efd;p=python

While scalling sys.modules, skip entries that don't have string keys,
to protect us from jokers who put items with non-string keys in
sys.modules.  Reported by Greg Stein.
---

diff --git a/Python/import.c b/Python/import.c
index 5c8d939979..c8bbc29a45 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -274,8 +274,8 @@ PyImport_Cleanup()
 		while (PyDict_Next(modules, &pos, &key, &value)) {
 			if (value->ob_refcnt != 1)
 				continue;
-			if (PyModule_Check(value)) {
-				name = PyString_AsString(key);
+			if (PyString_Check(key) && PyModule_Check(value)) {
+				name = PyString_AS_STRING(key);
 				if (strcmp(name, "__builtin__") == 0)
 					continue;
 				if (strcmp(name, "sys") == 0)
@@ -293,8 +293,8 @@ PyImport_Cleanup()
 	/* Next, delete all modules (still skipping __builtin__ and sys) */
 	pos = 0;
 	while (PyDict_Next(modules, &pos, &key, &value)) {
-		if (PyModule_Check(value)) {
-			name = PyString_AsString(key);
+		if (PyString_Check(key) && PyModule_Check(value)) {
+			name = PyString_AS_STRING(key);
 			if (strcmp(name, "__builtin__") == 0)
 				continue;
 			if (strcmp(name, "sys") == 0)