r17233 - in /trunk/libapache2-mod-perl2/debian: changelog patches/010-svn-fix-bleadperl.patch

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Wed Mar 12 13:05:05 2008
New Revision: 17233

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17233
Log:
* debian/patches/010-svn-fix-bleadperl.patch: add a null pointer reference
  fix from upstream SVN r481237.

Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=17233&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Wed Mar 12 13:05:05 2008
@@ -3,6 +3,8 @@
   * debian/patches/015-nonvoid-return.patch: make modperl_thx_interp_get()
     always return a value, fixing undefined behaviour that led to a SIGBUS 
     on sparc (Closes: #468327).
+  * debian/patches/010-svn-fix-bleadperl.patch: add a null pointer reference
+    fix from upstream SVN r481237.
 
  -- Niko Tyni <ntyni at debian.org>  Wed, 12 Mar 2008 14:44:17 +0200
 

Modified: trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch?rev=17233&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch (original)
+++ trunk/libapache2-mod-perl2/debian/patches/010-svn-fix-bleadperl.patch Wed Mar 12 13:05:05 2008
@@ -1,4 +1,4 @@
-Perl 5.9.x fixes from upstream SVN r480890 and r480903
+Perl 5.9.x fixes from upstream SVN r480890, r480903, and r481237.
 
 --- libapache2-mod-perl2.orig/src/modules/perl/mod_perl.c
 +++ libapache2-mod-perl2/src/modules/perl/mod_perl.c
@@ -12,7 +12,7 @@
 +  ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \
 +   PERL_VERSION > 9)
 +    modperl_cleanup_data_t *cdata = (modperl_cleanup_data_t *)data;
-+    PerlInterpreter *my_perl = (PerlInterpreter *)cdata->data;
++    PerlInterpreter *my_perl = cdata == NULL ? NULL : (PerlInterpreter *)cdata->data;
 +# endif
 +#endif
      MP_init_status = 0;