Fix IO::Handle.slurp not closing handle cases

Spotted while fixing R#3566. Note that IO::Path.slurp does *not* need a :close, as that is implicit in IO::Path.slurp.
rakudo · Mar 23, 2020 · efab398 · efab398
1 parent 42c4c3f
commit efab398
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/core.c/Distro.pm6 b/src/core.c/Distro.pm6
@@ -59,7 +59,8 @@ Rakudo::Internals.REGISTER-DYNAMIC: '$*DISTRO', {
 
     # darwin specific info
     if $name eq 'darwin' {
-        my $lookup := kv2Map(shell("sw_vers", :out, :err).out.slurp,':');
+        my $lookup :=
+          kv2Map(shell("sw_vers", :out, :err).out.slurp(:close),':');
         $name    := $_ with $lookup<ProductName>;
         $version := $_ with $lookup<ProductVersion>;
         $release := $_ with $lookup<BuildVersion>;
@@ -74,7 +75,8 @@ Rakudo::Internals.REGISTER-DYNAMIC: '$*DISTRO', {
         $desc    := $_ with $lookup<PRETTY_NAME>;
     }
     elsif $name eq 'linux' {
-        my $lookup := kv2Map(shell(<lsb_release -a>, :out, :err).out.slurp,":");
+        my $lookup :=
+          kv2Map(shell(<lsb_release -a>, :out, :err).out.slurp(:close),":");
         $auth    := $_ with $lookup<<"DISTRIBUTOR ID">>;
         $desc    := $_ with $lookup<DESCRIPTION>;
         $release := $_ with $lookup<RELEASE>;

diff --git a/src/core.c/IO/CatHandle.pm6 b/src/core.c/IO/CatHandle.pm6
@@ -290,10 +290,10 @@ my class IO::CatHandle is IO::Handle {
         nqp::if(
           nqp::defined($!active-handle),
           ([~] gather nqp::stmts( # the [~] takes care of both Str and Blobs
-            (take $!active-handle.slurp(:$bin)),
+            (take $!active-handle.slurp(:$bin, :close)),
             nqp::while(
               nqp::defined(self.next-handle),
-              take $!active-handle.slurp(:$bin)))),
+              take $!active-handle.slurp(:$bin, :close)))),
           Nil)
     }
     method slurp-rest (|) {