Merge pull request #2989 from jkseppan/tidyup-ttconv

Don't call Py_DECREF on null in _ttconv.cpp
matplotlib · Apr 19, 2014 · eb7fd2a · eb7fd2a
2 parents 03e60dc + 3dd16b5
commit eb7fd2a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -11,6 +11,7 @@
 #include <Python.h>
 #include "ttconv/pprdrv.h"
 #include <vector>
+#include <cassert>
 
 class PythonExceptionOccurred
 {
@@ -185,14 +186,17 @@ class PythonDictionaryCallback : public TTDictionaryCallback
 
     virtual void add_pair(const char* a, const char* b)
     {
+        assert(a != NULL);
+        assert(b != NULL);
         PyObject* value = PyBytes_FromString(b);
-        if (value)
+        if (!value)
         {
-            if (PyDict_SetItemString(_dict, a, value))
-            {
-                Py_DECREF(value);
-                throw PythonExceptionOccurred();
-            }
+            throw PythonExceptionOccurred();
+        }
+        if (PyDict_SetItemString(_dict, a, value))
+        {
+            Py_DECREF(value);
+            throw PythonExceptionOccurred();
         }
         Py_DECREF(value);
     }