From 55474766f0e0950c1c029aa910df7e850d1a1d8f Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 4 Apr 2002 16:22:30 +0000
Subject: Fix by Greg Chapman from SF bug 534347: Potential AV in
 vgetargskeywords.

Bugfix candidate.
---
 Python/getargs.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Python/getargs.c b/Python/getargs.c
index 411c695..280ffc3 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;
-- 
cgit v0.12