SWIGged updates

[wxWidgets.git] / wxPython / src / libpy.c

diff --git a/wxPython/src/libpy.c b/wxPython/src/libpy.c
index 5841d40a508d731b98f94f569be7948f77a2e9ab..1116e677df78433c162c5240281e31e109a434c8 100644 (file)
--- a/wxPython/src/libpy.c
+++ b/wxPython/src/libpy.c
@@ -5,10 +5,14 @@
  * Contains variable linking and pointer type-checking code.
  ************************************************************************/
 
  * Contains variable linking and pointer type-checking code.
  ************************************************************************/
 

+#include <string.h>
+#include <stdlib.h>
+
+#include "Python.h"
+

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "Python.h"

 
 /* Definitions for Windows/Unix exporting */
 #if defined(_WIN32) || defined(__WIN32__)
 
 /* Definitions for Windows/Unix exporting */
 #if defined(_WIN32) || defined(__WIN32__)


@@ -313,11 +317,11 @@ SWIG_GetPtr(char *c, void **ptr, char *t)
   if (*c != '_') {
     *ptr = (void *) 0;
     if (strcmp(c,"NULL") == 0) return (char *) 0;
   if (*c != '_') {
     *ptr = (void *) 0;
     if (strcmp(c,"NULL") == 0) return (char *) 0;

-    else c;
+    else return c;

   }
   c++;
   /* Extract hex value from pointer */
   }
   c++;
   /* Extract hex value from pointer */

-  while (d = *c) {
+  while ((d = *c) != 0) {

     if ((d >= '0') && (d <= '9'))
       p = (p << 4) + (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
     if ((d >= '0') && (d <= '9'))
       p = (p << 4) + (d - '0');
     else if ((d >= 'a') && (d <= 'f'))


@@ -358,7 +362,7 @@ SWIG_GetPtr(char *c, void **ptr, char *t)
   sp = &SwigPtrTable[start];
 
   /* Try to find a match */
   sp = &SwigPtrTable[start];
 
   /* Try to find a match */

-  while (start <= end) {
+  while (start < end) {               /* was "<="     --robin */

     if (strncmp(t,sp->name,sp->len) == 0) {
       name = sp->name;
       len = sp->len;
     if (strncmp(t,sp->name,sp->len) == 0) {
       name = sp->name;
       len = sp->len;


@@ -401,13 +405,34 @@ SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) {
   if (!PyString_Check(obj)) {
       if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this")))
           return "";
   if (!PyString_Check(obj)) {
       if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this")))
           return "";

+      // PyObject_GetAttrString increases sobj refcout !
+      Py_DECREF(sobj);

   }
   str = PyString_AsString(sobj);
   }
   str = PyString_AsString(sobj);

+  if (str == NULL)
+      return "";

   return SWIG_GetPtr(str,ptr,type);
 }
 
   return SWIG_GetPtr(str,ptr,type);
 }
 

+

 #ifdef __cplusplus
 }
 #endif
 
 
 #ifdef __cplusplus
 }
 #endif
 
 

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+