From: Guido van Rossum <guido@python.org>
Date: Thu, 4 Apr 2002 16:22:30 +0000 (+0000)
Subject: Fix by Greg Chapman from SF bug 534347: Potential AV in vgetargskeywords.
X-Git-Tag: v2.3c1~6141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55474766f0e0950c1c029aa910df7e850d1a1d8f;p=python

Fix by Greg Chapman from SF bug 534347: Potential AV in vgetargskeywords.

Bugfix candidate.
---

diff --git a/Python/getargs.c b/Python/getargs.c
index 411c69543d..280ffc3e46 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1216,7 +1216,13 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
 		int pos = 0;
 		while (PyDict_Next(keywords, &pos, &key, &value)) {
 			int match = 0;
-			char *ks = PyString_AsString(key);
+			char *ks;
+			if (!PyString_Check(key)) {
+				PyErr_SetString(PyExc_TypeError, 
+					        "keywords must be strings");
+				return 0;
+			}
+			ks = PyString_AsString(key);
 			for (i = 0; i < max; i++) {
 				if (!strcmp(ks, kwlist[i])) {
 					match = 1;