From 320ac331d110648cfb6404582e73249089086068 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Mon, 20 Oct 1997 17:26:25 +0000 Subject: [PATCH] dict_get(): Fixed a couple of stupid mistakes which caused crashes. Also got rid of some unnecessary code. --- Objects/dictobject.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index e5a461031e..e47e6b3cba 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -958,19 +958,13 @@ dict_get(mp, args) PyObject *args; { PyObject *key; - PyObject *failobj = NULL; + PyObject *failobj = Py_None; PyObject *val = NULL; long hash; - if (mp->ma_table == NULL) - goto finally; - if (!PyArg_ParseTuple(args, "O|O", &key, &failobj)) return NULL; - if (failobj == NULL) - failobj = Py_None; - #ifdef CACHE_HASH if (!PyString_Check(key) || (hash = ((PyStringObject *) key)->ob_shash) == -1) @@ -981,7 +975,7 @@ dict_get(mp, args) return NULL; } val = lookdict(mp, key, hash)->me_value; - finally: + if (val == NULL) val = failobj; Py_INCREF(val); -- 2.40.0