Fix segfault when using Python's -threads options and exceptions are thrown

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11980 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/common.mk

@@ -375,6 +375,7 @@ CPP_TEST_CASES += \
 	template_virtual \
 	template_whitespace \
 	threads \
+	threads_exception \
 	throw_exception \
 	typedef_array_member \
 	typedef_class \

Examples/test-suite/python/threads_exception_runme.py

@@ -0,0 +1,36 @@
+import threads_exception
+
+t = threads_exception.Test()
+try:
+  t.unknown()
+except RuntimeError,e:
+  pass
+
+try:
+  t.simple()
+except RuntimeError,e:
+  if e.args[0] != 37:
+    raise RuntimeError
+
+try:
+  t.message()
+except RuntimeError,e:
+  if e.args[0] != "I died.":
+    raise RuntimeError
+
+try:
+  t.hosed()
+except threads_exception.Exc,e:
+  if e.code != 42:
+    raise RuntimeError
+  if e.msg != "Hosed":
+    raise RuntimeError
+
+for i in range(1,4):
+  try:
+    t.multi(i)
+  except RuntimeError,e:
+    pass
+  except threads_exception.Exc,e:
+    pass
+

Examples/test-suite/threads_exception.i

@@ -0,0 +1,54 @@
+// Throw a lot of exceptions
+
+// The Python runtime tests were previously failing with the -threads option on Windows due to SWIG_PYTHON_THREAD_BEGIN_ALLOW not being within the try block.
+
+%module(threads="1") threads_exception
+
+%{
+struct A {};
+%}
+
+%inline %{
+#include <string>
+
+#if defined(_MSC_VER)
+  #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+
+class Exc {
+public:
+  Exc(int c, const char *m) {
+    code = c;
+    strncpy(msg,m,255);
+  }
+  int code;
+  char msg[256];
+};
+
+class Test {
+public:
+  int simple() throw(int) {
+      throw(37);
+      return 1;
+  }
+  int message() throw(const char *) {
+      throw("I died.");
+      return 1;
+  }
+  int hosed() throw(Exc) {
+      throw(Exc(42,"Hosed"));
+      return 1;
+  } 
+  int unknown() throw(A*) {
+      static A a;
+      throw &a;
+      return 1;
+  }
+  int multi(int x) throw(int, const char *, Exc) {
+     if (x == 1) throw(37);
+     if (x == 2) throw("Bleah!");
+     if (x == 3) throw(Exc(42,"No-go-diggy-die"));
+     return 1;
+  }
+};
+%}