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

Apply patch for Java to fix direct use of a weak global reference in directors sometimes causing seg faults especially on Android.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13834 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-09-13 19:02:02 +00:00
commit b38722e8ee
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -4,6 +4,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.9 (in progress) Version 2.0.9 (in progress)
=========================== ===========================
2012-09-11: wsfulton
[Java] Fix #3535304 - Direct use of a weak global reference in directors
sometimes causing seg faults especially on Android.
2012-09-06: wsfulton 2012-09-06: wsfulton
[Java] Fix (char *STRING, size_t LENGTH) typemaps to accept NULL string. [Java] Fix (char *STRING, size_t LENGTH) typemaps to accept NULL string.

2
Examples/android/extend/src/org/swig/extendexample/SwigExtend.java
View file

@ -118,9 +118,7 @@ public class SwigExtend extends Activity
// Time to delete the EmployeeList, which will delete all the Employee* // Time to delete the EmployeeList, which will delete all the Employee*
// items it contains. The last item is our CEO, which gets destroyed as well. // items it contains. The last item is our CEO, which gets destroyed as well.
/* Causes app to die
list.delete(); list.delete();
*/
outputText.append( "----------------------\n" ); outputText.append( "----------------------\n" );
} }

3
Lib/java/director.swg
View file

@ -149,7 +149,7 @@ namespace Swig {
void swig_disconnect_director_self(const char *disconn_method) { void swig_disconnect_director_self(const char *disconn_method) {
JNIEnvWrapper jnienv(this) ; JNIEnvWrapper jnienv(this) ;
JNIEnv *jenv = jnienv.getJNIEnv() ; JNIEnv *jenv = jnienv.getJNIEnv() ;
jobject jobj = swig_self_.peek(); jobject jobj = swig_self_.get(jenv);
#if defined(DEBUG_DIRECTOR_OWNED) #if defined(DEBUG_DIRECTOR_OWNED)
std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl; std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
#endif #endif
@ -162,6 +162,7 @@ namespace Swig {
jenv->CallVoidMethod(jobj, disconn_meth); jenv->CallVoidMethod(jobj, disconn_meth);
} }
} }
jenv->DeleteLocalRef(jobj);
} }
public: public: