From 133acf7b389614db651d1ed570d4a0ca0c747999 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 24 Jun 2010 20:44:07 +0100
Subject: [PATCH] In pp_sort, ensure that @_ is freed correctly.

Before this, if @_ had become AvREAL(), it retains reference on its elements.
---
 pp_sort.c   |  6 +++---
 t/op/sort.t | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/pp_sort.c b/pp_sort.c
index 51cf216..48d4273 100644
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -1678,9 +1678,9 @@ PP(pp_sort)
 		    sort_flags);
 
 	    if (!(flags & OPf_SPECIAL)) {
-		LEAVESUB(cv);
-		if (!is_xsub)
-		    CvDEPTH(cv)--;
+		SV *sv;
+		POPSUB(cx, sv);
+		LEAVESUB(sv);
 	    }
 	    POPBLOCK(cx,PL_curpm);
 	    PL_stack_sp = newsp;
diff --git a/t/op/sort.t b/t/op/sort.t
index 88e07ea..f92cc95 100644
--- a/t/op/sort.t
+++ b/t/op/sort.t
@@ -6,7 +6,7 @@ BEGIN {
     require 'test.pl';
 }
 use warnings;
-plan( tests => 153 );
+plan( tests => 159 );
 
 # these shouldn't hang
 {
@@ -853,3 +853,40 @@ fresh_perl_is('sub w ($$) {my ($l, my $r) = @_; my $v = \@_; undef @_; @_ = 0..2
              '0 1 2 3',
              {stderr => 1, switches => ['-w']},
              'RT #72334');
+
+{
+    my $count = 0;
+    {
+	package Counter;
+
+	sub new {
+	    ++$count;
+	    bless [];
+	}
+
+	sub DESTROY {
+	    --$count;
+	}
+    }
+
+    sub sorter ($$) {
+	my ($l, $r) = @_;
+	my $q = \@_;
+	$l <=> $r;
+    }
+
+    is($count, 0, 'None before we start');
+    my @a = map { Counter->new() } 0..1;
+    is($count, 2, '2 here');
+
+    my @b = sort sorter @a;
+
+    is(scalar @b, 2);
+    cmp_ok($b[0], '<', $b[1], 'sorted!');
+
+    is($count, 2, 'still the same 2 here');
+
+    @a = (); @b = ();
+
+    is($count, 0, 'all gone');
+}
-- 
1.8.3.1