Bug#612475: swig2.0: zend_error_noreturn should be zend_error

[Mathieu Malaterre]

Package: swig2.0
Version: 2.0.1-2
Severity: important
Tags: patch


Hi,

  It would be nice if the next upload would contains this patch as it fixes an 
issue in the PHP wrapper.

Thanks

-- System Information:
Debian Release: 6.0
  APT prefers stable
  APT policy: (500, 'stable'), (200, 'testing'), (100, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages swig2.0 depends on:
ii  libc6                   2.11.2-9         Embedded GNU C Library: Shared lib
ii  libgcc1                 1:4.4.5-8        GCC support library
ii  libpcre3                8.02-1.1         Perl 5 Compatible Regular Expressi
ii  libstdc++6              4.4.5-8          The GNU Standard C++ Library v3
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

swig2.0 recommends no packages.

Versions of packages swig2.0 suggests:
pn  swig2.0-doc                   <none>     (no description available)
pn  swig2.0-examples              <none>     (no description available)

-- no debconf information

Index: swig2.0-2.0.1/Source/Modules/php.cxx
===================================================================
--- swig2.0-2.0.1.orig/Source/Modules/php.cxx	2011-02-08 18:38:28.000000000 +0100
+++ swig2.0-2.0.1/Source/Modules/php.cxx	2011-02-08 18:38:48.000000000 +0100
@@ -976,7 +976,7 @@
     /* Error handling code */
     Printf(f->code, "fail:\n");
     Printv(f->code, cleanup, NIL);
-    Printv(f->code, "zend_error_noreturn(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL);
+    Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL);
 
     Printf(f->code, "}\n");
 
@@ -2291,7 +2291,7 @@
 
     Append(f->code, "return;\n");
     Append(f->code, "fail:\n");
-    Append(f->code, "zend_error_noreturn(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n");
+    Append(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n");
     Printf(f->code, "}\n");
 
     Wrapper_print(f, s_wrappers);
@@ -2666,7 +2666,7 @@
     }
 
     Append(w->code, "fail:\n");
-    Append(w->code, "zend_error_noreturn(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n");
+    Append(w->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n");
     Append(w->code, "}\n");
 
     // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method