From 09d43dcbdff4a450a72178d695db553c2f33ef27 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 25 Sep 2008 14:58:05 +0300
Subject: [PATCH] Don't go onto wild zombie rampage if python callback
 tracebacks (rhbz#463447) - If a callback tracebacks, the python program that
 called us in the first   place is as good as dead already. Clean up what we
 can, throw an error   message and just die, no good is going to come out of
 blindly continuing.

---
 python/rpmts-py.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index cf7e4a3..089953e 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -146,7 +146,6 @@ struct rpmtsCallbackType_s {
     PyObject * cb;
     PyObject * data;
     rpmtsObject * tso;
-    int pythonError;
     PyThreadState *_save;
 };
 
@@ -168,6 +167,23 @@ fprintf(stderr, "*** rpmts_Debug(%p) ts %p\n", s, s->ts);
     return Py_None;
 }
 
+static void die(PyObject *cb)
+{
+    char *pyfn = NULL;
+    PyObject *r;
+
+    if (PyErr_Occurred()) {
+	PyErr_Print();
+    }
+    if ((r = PyObject_Repr(cb)) != NULL) { 
+	pyfn = PyString_AsString(r);
+    }
+    fprintf(stderr, _("error: python callback %s failed, aborting!\n"), 
+	    	      pyfn ? pyfn : "???");
+    rpmdbCheckTerminate(1);
+    exit(EXIT_FAILURE);
+}
+
 /** \ingroup py_c
  */
 static PyObject *
@@ -288,7 +304,6 @@ if (_rpmts_debug)
 fprintf(stderr, "*** rpmts_SolveCallback(%p,%p,%p) \"%s\"\n", ts, ds, data, rpmdsDNEVR(ds));
 
     if (cbInfo->tso == NULL) return res;
-    if (cbInfo->pythonError) return res;
     if (cbInfo->cb == Py_None) return res;
 
     PyEval_RestoreThread(cbInfo->_save);
@@ -299,7 +314,7 @@ fprintf(stderr, "*** rpmts_SolveCallback(%p,%p,%p) \"%s\"\n", ts, ds, data, rpmd
     Py_DECREF(args);
 
     if (!result) {
-	cbInfo->pythonError = 1;
+	die(cbInfo->cb);
     } else {
 	if (PyInt_Check(result))
 	    res = PyInt_AsLong(result);
@@ -341,7 +356,6 @@ if (_rpmts_debug)
 fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
 
     cbInfo.tso = s;
-    cbInfo.pythonError = 0;
     cbInfo._save = PyEval_SaveThread();
 
     xx = rpmtsCheck(s->ts);
@@ -792,7 +806,6 @@ rpmtsCallback(const void * hd, const rpmCallbackType what,
     PyObject * args, * result;
     static FD_t fd;
 
-    if (cbInfo->pythonError) return NULL;
     if (cbInfo->cb == Py_None) return NULL;
 
     /* Synthesize a python object for callback (if necessary). */
@@ -816,18 +829,14 @@ rpmtsCallback(const void * hd, const rpmCallbackType what,
     Py_DECREF(pkgObj);
 
     if (!result) {
-	cbInfo->pythonError = 1;
-	cbInfo->_save = PyEval_SaveThread();
-	return NULL;
+	die(cbInfo->cb);
     }
 
     if (what == RPMCALLBACK_INST_OPEN_FILE) {
 	int fdno;
 
         if (!PyArg_Parse(result, "i", &fdno)) {
-	    cbInfo->pythonError = 1;
-	    cbInfo->_save = PyEval_SaveThread();
-	    return NULL;
+	    die(cbInfo->cb);
 	}
 	Py_DECREF(result);
 	cbInfo->_save = PyEval_SaveThread();
@@ -927,7 +936,6 @@ rpmts_Run(rpmtsObject * s, PyObject * args, PyObject * kwds)
 	return NULL;
 
     cbInfo.tso = s;
-    cbInfo.pythonError = 0;
     cbInfo._save = PyEval_SaveThread();
 
     if (cbInfo.cb != NULL) {
@@ -949,11 +957,6 @@ fprintf(stderr, "*** rpmts_Run(%p) ts %p ignore %x\n", s, s->ts, s->ignoreSet);
 
     PyEval_RestoreThread(cbInfo._save);
 
-    if (cbInfo.pythonError) {
-	ps = rpmpsFree(ps);
-	return NULL;
-    }
-
     if (rc < 0) {
 	list = PyList_New(0);
 	return list;
-- 
2.7.4