From 09921099799a7cacdb74dfb75c974060475b112c Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 7 Nov 2006 13:38:17 +0000
Subject: [PATCH] increment Py_None correctly

---
 direct/src/dcparser/dcClass.cxx  | 2 ++
 direct/src/dcparser/dcPacker.cxx | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/direct/src/dcparser/dcClass.cxx b/direct/src/dcparser/dcClass.cxx
index 400280583d..ced7c26afe 100644
--- a/direct/src/dcparser/dcClass.cxx
+++ b/direct/src/dcparser/dcClass.cxx
@@ -426,6 +426,7 @@ set_class_def(PyObject *class_def) {
 PyObject *DCClass::
 get_class_def() const {
   if (_class_def == NULL) {
+    Py_INCREF(Py_None);
     return Py_None;
   }
 
@@ -474,6 +475,7 @@ set_owner_class_def(PyObject *owner_class_def) {
 PyObject *DCClass::
 get_owner_class_def() const {
   if (_owner_class_def == NULL) {
+    Py_INCREF(Py_None);
     return Py_None;
   }
 
diff --git a/direct/src/dcparser/dcPacker.cxx b/direct/src/dcparser/dcPacker.cxx
index 602447312c..f70302fba1 100755
--- a/direct/src/dcparser/dcPacker.cxx
+++ b/direct/src/dcparser/dcPacker.cxx
@@ -802,6 +802,7 @@ unpack_object() {
   switch (pack_type) {
   case PT_invalid:
     object = Py_None;
+    Py_INCREF(object);
     unpack_skip();
     break;
 
@@ -900,7 +901,7 @@ unpack_object() {
     break;
   }
 
-  nassertr(object != (PyObject *)NULL, Py_None);
+  nassertr(object != (PyObject *)NULL, NULL);
   return object;
 }
 #endif  // HAVE_PYTHON