[Adonthell-commits] CVS: adonthell/src dialog.cc,1.22,1.23

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv22867

Modified Files:
        dialog.cc 
Log Message:
FIXED crash when loading old dialogue script
FIXED memleak


Index: dialog.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/dialog.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** dialog.cc   12 Apr 2002 15:35:40 -0000      1.22
--- dialog.cc   12 Apr 2002 20:51:32 -0000      1.23
***************
*** 68,72 ****
      // Extract the dialogue's strings
      PyObject *list = dialogue.get_attribute ("text");
!     if (!list) return false;
  
      PyObject *s;
--- 68,72 ----
      // Extract the dialogue's strings
      PyObject *list = dialogue.get_attribute ("text");
!     if (!list || !PyList_Check (list)) return false;
  
      PyObject *s;
***************
*** 223,226 ****
--- 223,230 ----
              stop = true;
          }
+     
+         // cleanup
+         Py_XDECREF (speaker);
+         Py_XDECREF (speech);
      }
      while (!stop);            
***************
*** 228,235 ****
      // init the iterator for dialogue text retrieval
      i_text = text_.begin ();
-     
-     // cleanup
-     Py_XDECREF (speaker);
-     Py_XDECREF (speech);
  }
  
--- 232,235 ----