[Swig-cvs] SF.net SVN: swig:[11463] trunk

[<ol...@us...>]

Revision: 11463
          http://swig.svn.sourceforge.net/swig/?rev=11463&view=rev
Author:   olly
Date:     2009-07-29 02:06:18 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
[PHP] Fix memory leak in PHP resource destructor for classes
without a destructor and non-class types.  Patch from Hitoshi Amano
in SF#2825303.

Modified Paths:
--------------
    trunk/CHANGES.current
    trunk/Source/Modules/php.cxx

Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current	2009-07-28 21:58:47 UTC (rev 11462)
+++ trunk/CHANGES.current	2009-07-29 02:06:18 UTC (rev 11463)
@@ -1,6 +1,11 @@
 Version 1.3.40 (in progress)
 ============================
 
+2009-07-29: olly
+	    [PHP] Fix memory leak in PHP resource destructor for classes
+	    without a destructor and non-class types.  Patch from Hitoshi Amano
+	    in SF#2825303.
+
 2009-07-28: olly
 	    [PHP] Update warnings about clashes between identifiers and PHP
 	    keywords and automatic renaming to work with the PHP5 class

Modified: trunk/Source/Modules/php.cxx
===================================================================
--- trunk/Source/Modules/php.cxx	2009-07-28 21:58:47 UTC (rev 11462)
+++ trunk/Source/Modules/php.cxx	2009-07-29 02:06:18 UTC (rev 11463)
@@ -158,9 +158,11 @@
         Printf(s_wrappers, "  %s(rsrc, SWIGTYPE%s->name TSRMLS_CC);\n", destructor, key);
       } else {
         Printf(s_wrappers, "  /* No destructor for class %s */\n", human_name);
+        Printf(s_wrappers, "  efree(rsrc->ptr);\n");
       }
     } else {
       Printf(s_wrappers, "  /* No destructor for simple type %s */\n", key);
+      Printf(s_wrappers, "  efree(rsrc->ptr);\n");
     }
 
     // close function


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.