From 32f6691024ff057b31c2cd653e7c41c7c40c818a Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Tue, 31 Aug 2021 10:07:42 +0200
Subject: [PATCH 1/2] Update error handling in Python bindings, using the new
 PGF_EXN_OTHER_ERROR

---
 src/runtime/python/pypgf.c | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/runtime/python/pypgf.c b/src/runtime/python/pypgf.c
index b54cfe549..eb90553a4 100644
--- a/src/runtime/python/pypgf.c
+++ b/src/runtime/python/pypgf.c
@@ -2967,12 +2967,12 @@ pgf_collect_cats(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
 
     py_name = PyString_FromString(name->text);
     if (py_name == NULL) {
-        // gu_raise(err, PgfExn);
+        err->type = PGF_EXN_OTHER_ERROR;
         goto end;
     }
 
     if (PyList_Append((PyObject*) clo->collection, py_name) != 0) {
-        // gu_raise(err, PgfExn);
+        err->type = PGF_EXN_OTHER_ERROR;
         goto end;
     }
 
@@ -2990,6 +2990,10 @@ PGF_getCategories(PGFObject *self, void *closure)
     PgfExn err;
     PyPGFClosure clo = { { pgf_collect_cats }, self, categories };
     pgf_iter_categories(self->pgf, &clo.fn, &err);
+    if (err.type != PGF_EXN_NONE) {
+        Py_DECREF(categories);
+        return NULL;
+    }
 
     return categories;
 }
@@ -3024,12 +3028,12 @@ pgf_collect_funs(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
 
     py_name = PyString_FromString(name->text);
     if (py_name == NULL) {
-        // gu_raise(err, PgfExn);
+        err->type = PGF_EXN_OTHER_ERROR;
         goto end;
     }
 
     if (PyList_Append((PyObject*) clo->collection, py_name) != 0) {
-        // gu_raise(err, PgfExn);
+        err->type = PGF_EXN_OTHER_ERROR;
         goto end;
     }
 
@@ -3047,13 +3051,10 @@ PGF_getFunctions(PGFObject *self, void *closure)
     PgfExn err;
     PyPGFClosure clo = { { pgf_collect_funs }, self, functions };
     pgf_iter_functions(self->pgf, &clo.fn, &err);
-    // if (!gu_ok(err)) {
-    //     Py_DECREF(functions);
-    //     gu_pool_free(tmp_pool);
-    //     return NULL;
-    // }
-    //
-    // gu_pool_free(tmp_pool);
+    if (err.type != PGF_EXN_NONE) {
+        Py_DECREF(functions);
+        return NULL;
+    }
 
     return functions;
 }
@@ -3079,13 +3080,10 @@ PGF_functionsByCat(PGFObject* self, PyObject *args)
     PgfExn err;
     PyPGFClosure clo = { { pgf_collect_funs }, self, functions };
     pgf_iter_functions_by_cat(self->pgf, catname, &clo.fn, &err);
-    // if (!gu_ok(err)) {
-    //     Py_DECREF(functions);
-    //     gu_pool_free(tmp_pool);
-    //     return NULL;
-    // }
-    //
-    // gu_pool_free(tmp_pool);
+    if (err.type != PGF_EXN_NONE) {
+        Py_DECREF(functions);
+        return NULL;
+    }
 
     return functions;
 }

From 8061a9e82afed1926710e104cf6a6895d3d6937a Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@digitalgrammars.com>
Date: Tue, 31 Aug 2021 10:12:27 +0200
Subject: [PATCH 2/2] Replace uses of PyUnicode_FromString with
 PyUnicode_FromStringAndSize

See https://github.com/GrammaticalFramework/gf-core/issues/130#issuecomment-908979886
---
 src/runtime/python/pypgf.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/runtime/python/pypgf.c b/src/runtime/python/pypgf.c
index eb90553a4..931f20d3b 100644
--- a/src/runtime/python/pypgf.c
+++ b/src/runtime/python/pypgf.c
@@ -23,7 +23,6 @@
 
 #if PY_MAJOR_VERSION >= 3
     #define PyString_Check               PyUnicode_Check
-    #define PyString_FromString          PyUnicode_FromString
     #define PyString_FromStringAndSize   PyUnicode_FromStringAndSize
     #define PyString_FromFormat          PyUnicode_FromFormat
     #define PyString_Concat(ps,s)        {PyObject* tmp = *(ps); *(ps) = PyUnicode_Concat(tmp,s); Py_DECREF(tmp);}
@@ -2867,7 +2866,7 @@ static PyObject*
 PGF_getAbstractName(PGFObject *self, void *closure)
 {
     PgfText* txt = pgf_abstract_name(self->pgf);
-    return PyString_FromString(txt->text);
+    return PyString_FromStringAndSize(txt->text, txt->size);
 }
 
 // static void
@@ -2965,7 +2964,7 @@ pgf_collect_cats(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
 
     PyObject* py_name = NULL;
 
-    py_name = PyString_FromString(name->text);
+    py_name = PyString_FromStringAndSize(name->text, name->size);
     if (py_name == NULL) {
         err->type = PGF_EXN_OTHER_ERROR;
         goto end;
@@ -3026,7 +3025,7 @@ pgf_collect_funs(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
 
     PyObject* py_name = NULL;
 
-    py_name = PyString_FromString(name->text);
+    py_name = PyString_FromStringAndSize(name->text, name->size);
     if (py_name == NULL) {
         err->type = PGF_EXN_OTHER_ERROR;
         goto end;
@@ -3720,7 +3719,7 @@ MOD_INIT(pgf)
     Py_INCREF(PGFError);
 
     PyObject *dict = PyDict_New();
-    PyDict_SetItemString(dict, "token", PyString_FromString(""));
+    PyDict_SetItemString(dict, "token", PyString_FromStringAndSize("", 0));
     ParseError = PyErr_NewException("pgf.ParseError", NULL, dict);
     PyModule_AddObject(m, "ParseError", ParseError);
     Py_INCREF(ParseError);