Ticket #647: xapian.patch

.0/Xapian/QueryParser.pm

@@ -34 +34 @@
   return $qp;
 }
 
-my %subrefs;
-
-sub add_valuerangeprocessor {
-  my ($self, $vrp) = @_;
-  $self->add_valuerangeprocessor0($vrp);
-  push @{$subrefs{"$self"}}, $vrp; # keep a reference
-}
-
-sub set_stopper {
-  my ($self, $stopper) = @_;
-  $self->set_stopper0($stopper);
-  push @{$subrefs{"$self"}}, $stopper; # keep a reference
-}
-
-sub _delete_subrefs { delete $subrefs{"$_[0]"} }
-
 1;
 
 __END__

Search-Xapian-1.2.15.0

@@ -22 +22 @@
         THIS->set_stemming_strategy(static_cast<QueryParser::stem_strategy>(strategy));
 
 void
-QueryParser::set_stopper0(stopper)
+QueryParser::set_stopper(stopper)
     Stopper * stopper
     CODE:
+        // FIXME: no corresponding SvREFCNT_dec(), but a leak seems better than
+        // a SEGV!
+        SvREFCNT_inc(ST(1));
         THIS->set_stopper(stopper);
 
 void
@@ -113 +116 @@
 QueryParser::get_description()
 
 void
-QueryParser::add_valuerangeprocessor0(ValueRangeProcessor * vrproc)
+QueryParser::add_valuerangeprocessor(ValueRangeProcessor * vrproc)
     CODE:
+        // FIXME: no corresponding SvREFCNT_dec(), but a leak seems better than
+        // a SEGV!
+        SvREFCNT_inc(ST(1));
         THIS->add_valuerangeprocessor(vrproc);
 
 void
 QueryParser::DESTROY()
-    CODE:
-       {
-          dSP;
-          ENTER;
-          SAVETMPS;
-          PUSHMARK( sp);
-          XPUSHs( ST(0) );
-          PUTBACK;
-          perl_call_method("_delete_subrefs", G_DISCARD);
-          SPAGAIN; 
-          FREETMPS; 
-          LEAVE;
-       }
-       delete THIS;