stop leaking memory for quoted subs

diff --git a/lib/Sub/Quote.pm b/lib/Sub/Quote.pm
index d9efa85..3c12c61 100644 (file)
--- a/lib/Sub/Quote.pm
+++ b/lib/Sub/Quote.pm
@@ -63,18 +63,18 @@ sub quote_sub {
   undef($captures) if $captures && !keys %$captures;
   my $code = pop;
   my $name = $_[0];
-  my $deferred;
-  $deferred = defer_sub +($options->{no_install} ? undef : $name) => sub {
-    unquote_sub($deferred);
+  my $quoted_info;
+  my $deferred = defer_sub +($options->{no_install} ? undef : $name) => sub {
+    unquote_sub($quoted_info->[4]);
   };
-  $QUOTED{$deferred} = [ $name, $code, $captures ];
-  weaken($WEAK_REFS{$deferred} = $deferred);
+  $quoted_info = [ $name, $code, $captures, undef, $deferred ];
+  weaken($QUOTED{$deferred} = $quoted_info);
   return $deferred;
 }
 
 sub quoted_from_sub {
   my ($sub) = @_;
-  $WEAK_REFS{$sub||''} and $QUOTED{$sub||''};
+  $QUOTED{$sub||''};
 }
 
 sub unquote_sub {
@@ -116,8 +116,8 @@ sub unquote_sub {
 }
 
 sub CLONE {
-  %QUOTED = map { $WEAK_REFS{$_} => $QUOTED{$_} } keys %WEAK_REFS;
-  %WEAK_REFS = map { $_ => $_ } values %WEAK_REFS;
+  %QUOTED = map { defined $_ ? ($_->[4] => $_) : () } values %QUOTED;
+  weaken($_) for values %QUOTED;
 }
 
 1;

diff --git a/t/sub-quote.t b/t/sub-quote.t
index 4cc9a1d..301366e 100644 (file)
--- a/t/sub-quote.t
+++ b/t/sub-quote.t
@@ -47,4 +47,16 @@ like(
   'exception contains correct name'
 );
 
+quote_sub 'Foo::four' => q{
+  return 5;
+};
+
+my $quoted = quoted_from_sub(\&Foo::four);
+like $quoted->[1], qr/return 5;/,
+  'can get quoted from installed sub';
+Foo::four();
+my $quoted2 = quoted_from_sub(\&Foo::four);
+is $quoted2->[1], undef,
+  "can't get quoted from installed sub after undefer";
+
 done_testing;