From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 24 Nov 2019 16:25:18 +0000 (+0000)
Subject: key.c: Parse `KeyError' constructor arguments by hand.
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/commitdiff_plain/e9007aacc11beec8ee9521ff960c58f56b035ebc

key.c: Parse `KeyError' constructor arguments by hand.

This allows additional arguments to be stored, as is conventional for
exception classes.
---

diff --git a/key.c b/key.c
index 4995035..d91651a 100644
--- a/key.c
+++ b/key.c
@@ -36,16 +36,21 @@ static PyObject *keyfilebrokenexc;
 
 static PyObject *kxmeth___init__(PyObject *me, PyObject *arg)
 {
-  int err;
+  long err;
   PyObject *x = 0;
   Py_ssize_t n;
 
   n = PyTuple_GET_SIZE(arg);
-  if (!PyArg_ParseTuple(arg, "Oi:__init__", &me, &err) ||
-      (x = PyInt_FromLong(err)) == 0 ||
-      PyObject_SetAttrString(me, "err", x))
-    goto end;
+  if (n < 2) TYERR("__init__() takes at least two arguments");
+  me = PyTuple_GET_ITEM(arg, 0);
+  err = PyInt_AsLong(PyTuple_GET_ITEM(arg, 1));
+  if (err == -1 && PyErr_Occurred()) goto end;
+  if (INT_MIN > err || err > INT_MAX) OVFERR("error code out of range");
+
+  x = PyInt_FromLong(err); if (!x) goto end;
+  if (PyObject_SetAttrString(me, "err", x)) goto end;
   Py_DECREF(x); x = 0;
+
   if ((x = PyString_FromString(key_strerror(err))) == 0 ||
       PyObject_SetAttrString(me, "errstring", x))
     goto end;