jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PHP] Fix segfault when wrapping a non-class function marked with

Browse source 
%newobject (testcase char_strings).


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10564 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2008-06-23 22:58:03 +00:00
commit 376adf0e64
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.36 (in progress) Version 1.3.36 (in progress)
============================= =============================
06/24/2008: olly
[PHP] Fix segfault when wrapping a non-class function marked with
%newobject (testcase char_strings).
06/22/2008: wsfulton 06/22/2008: wsfulton
[Java] Add a way to use AttachCurrentThreadAsDaemon instead of AttachCurrentThread [Java] Add a way to use AttachCurrentThreadAsDaemon instead of AttachCurrentThread
in director code. Define the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro, see in director code. Define the SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON macro, see

3
Source/Modules/php4.cxx
View file

@ -1749,7 +1749,8 @@ public:
} }
Printf(output, "\n"); Printf(output, "\n");
if (wrapperType == memberfn || newobject) { // If it's a member function or a class constructor...
if (wrapperType == memberfn || (newobject && current_class)) {
Printf(output, "\tfunction %s(%s) {\n", methodname, args); Printf(output, "\tfunction %s(%s) {\n", methodname, args);
// We don't need this code if the wrapped class has a copy ctor // We don't need this code if the wrapped class has a copy ctor
// since the flat function new_CLASSNAME will handle it for us. // since the flat function new_CLASSNAME will handle it for us.