- rediffed target_arch and Math-Pari crash-workaround patches

[packages/parigp.git] / perl-Math-Pari-crash-workaround.patch

Math::Pari doesn't work properly with Data::Dumper[1], so try at least to
avoid crash when trying to DESTROY something restored from dump
(most likely to happen on 64-bit machines, when Data::Dumper uses string
instead of int for pointer values which don't fit in 32 bits).

[1] Data::Dumper returns something like
bless( do{\(my $o = POINTER_VAL)}, 'Math::Pari' );
where POINTER_VAL is just value of pointer to already existing Pari
object (which may be destroyed later!).

--- Math-Pari-2.030518/Pari.xs.orig	2019-04-20 05:02:34.000000000 +0200
+++ Math-Pari-2.030518/Pari.xs	2021-06-26 09:51:04.478020090 +0200
@@ -1377,6 +1377,13 @@ moveoffstack_newer_than(SV* sv)
   SV* nextsv;
   long ret=0;
   
+  /* check if it exists on stack to avoid crash */
+  for (sv1 = PariStack; sv1 != sv; sv1 = nextsv) {
+    nextsv = (SV *) SvPVX(sv1);
+    if((char*)nextsv == GENfirstOnStack)
+      return -1; /* not on stack! */
+  }
+  
   for (sv1 = PariStack; sv1 != sv; sv1 = nextsv) {
     ret++;
     SV_OAVMA_switch(nextsv, sv1, GENmovedOffStack); /* Mark as moved off stack. */
@@ -4285,7 +4292,7 @@ DESTROY(rv)
 	 long oldavma;			 /* The value of avma on the entry
 					  * to function having the SV as
 					  * argument. */
-	 long howmany;
+	 long howmany = 0;
 	 SV_OAVMA_PARISTACK_get(sv, oldavma, ostack);
 	 oldavma += myPARI_bot;
 #if 1
@@ -4318,6 +4325,7 @@ DESTROY(rv)
 	     /* Now fall through: */
 /* case (IV)GENfirstOnStack: */
 	     /* Now sv is the newest one on stack. */
+	     if (howmany >= 0) {
 	     onStack_dec;
 	     perlavma = oldavma;
 	     if (oldavma > sentinel) {
@@ -4326,7 +4334,9 @@ DESTROY(rv)
 		 avma = oldavma;	/* Mark the space on stack as free. */
 	     }
 	     PariStack = (SV*)ostack; /* The same on the Perl/PARI side. */
+	     }
 	 }
+	 if (howmany >= 0)
 	 SVnum_dec;
      }