fixed a bug where raising an exception causes a crash (#187)

bab2min · Jan 22, 2023 · c13c651 · c13c651
1 parent dca6d04
commit c13c651
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/python/PyUtils.h b/src/python/PyUtils.h
@@ -1313,6 +1313,7 @@ namespace py
 			{
 				PyObject* exc, * val, * tb, * val2;
 				PyErr_Fetch(&exc, &val, &tb);
+				PyErr_NormalizeException(&exc, &val, &tb);
 				if (tb)
 				{
 					PyException_SetTraceback(val, tb);
@@ -1321,7 +1322,9 @@ namespace py
 				Py_DECREF(exc);
 				PyObject* et = e.pytype();
 				val2 = PyObject_CallFunctionObjArgs(et, py::UniqueObj{ buildPyValue(e.what()) }.get(), nullptr);
+				Py_INCREF(val);
 				PyException_SetCause(val2, val);
+				PyException_SetContext(val2, val);
 				PyErr_SetObject(et, val2);
 				Py_DECREF(val2);
 			}
@@ -1355,6 +1358,7 @@ namespace py
 			{
 				PyObject* exc, * val, * tb, * val2;
 				PyErr_Fetch(&exc, &val, &tb);
+				PyErr_NormalizeException(&exc, &val, &tb);
 				if (tb)
 				{
 					PyException_SetTraceback(val, tb);
@@ -1363,7 +1367,9 @@ namespace py
 				Py_DECREF(exc);
 				PyObject* et = e.pytype();
 				val2 = PyObject_CallFunctionObjArgs(et, py::UniqueObj{ buildPyValue(e.what()) }.get(), nullptr);
+				Py_INCREF(val);
 				PyException_SetCause(val2, val);
+				PyException_SetContext(val2, val);
 				PyErr_SetObject(et, val2);
 				Py_DECREF(val2);
 			}

diff --git a/test/unit_test.py b/test/unit_test.py
@@ -247,6 +247,15 @@ def infer_together(cls, inputFile, mdFields, f, kargs, ps):
 
     mdl.infer(unseen_docs, parallel=ps, together=True)
 
+def test_issue_187_crash_exc():
+    mdl = tp.LDAModel(k=10)
+    exc = None
+    try:
+        mdl.add_doc([[0, 1]])
+    except Exception as e:
+        exc = e
+    assert isinstance(exc, ValueError)
+
 def train_raw_corpus(cls, inputFile, mdFields, f, kargs, ps):
     print('Test train with raw corpus')
     from nltk.stem.porter import PorterStemmer