From 4a0efda0e61fe2fd3d461b8105efc039df4ca522 Mon Sep 17 00:00:00 2001 From: krangelov Date: Sat, 25 Sep 2021 08:11:05 +0200 Subject: [PATCH] fix the handling of PGF_EXN_OTHER_ERROR --- src/runtime/python/ffi.c | 2 -- src/runtime/python/pypgf.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/runtime/python/ffi.c b/src/runtime/python/ffi.c index c964c676f..fbe91746c 100644 --- a/src/runtime/python/ffi.c +++ b/src/runtime/python/ffi.c @@ -20,8 +20,6 @@ PgfExnType handleError(PgfExn err) } else if (err.type == PGF_EXN_PGF_ERROR) { PyErr_SetString(PGFError, err.msg); free((char *)err.msg); - } else if (err.type == PGF_EXN_OTHER_ERROR) { - PyErr_SetString(PGFError, "an unknown error occured"); } return err.type; } diff --git a/src/runtime/python/pypgf.c b/src/runtime/python/pypgf.c index 099382f72..0ebc01e63 100644 --- a/src/runtime/python/pypgf.c +++ b/src/runtime/python/pypgf.c @@ -83,13 +83,11 @@ _collect_cats(PgfItor *fn, PgfText *key, void *value, PgfExn *err) PyObject *py_name = PyUnicode_FromStringAndSize(name->text, name->size); if (py_name == NULL) { err->type = PGF_EXN_OTHER_ERROR; - err->msg = "unable to create string from category"; return; } if (PyList_Append((PyObject*) clo->collection, py_name) != 0) { err->type = PGF_EXN_OTHER_ERROR; - err->msg = "unable append category to list"; Py_DECREF(py_name); } } @@ -165,12 +163,11 @@ _collect_funs(PgfItor *fn, PgfText *key, void *value, PgfExn *err) PyObject *py_name = PyUnicode_FromStringAndSize(name->text, name->size); if (py_name == NULL) { err->type = PGF_EXN_OTHER_ERROR; - err->msg = "unable to create string from function"; + return; } if (PyList_Append((PyObject*) clo->collection, py_name) != 0) { err->type = PGF_EXN_OTHER_ERROR; - err->msg = "unable append function to list"; Py_DECREF(py_name); } }