File 2362-erl_tar-Close-files-after-reading-from-a-t... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2362-erl_tar-Close-files-after-reading-from-a-tar-file.patch of Package erlang (Revision 1df3ed72f7aa9edd3e18418a69795124)

Currently displaying revision 1df3ed72f7aa9edd3e18418a69795124 , Show latest

From 59524c3fff40ac9792bb92449eb594fed52b423e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 9 Mar 2017 16:15:13 +0100
Subject: [PATCH] erl_tar: Close files after reading from a tar file

Also let the test suite verify that all files that are
opened will be closed before the end of each test case.

aa0c4b0df7cdc7 introduced the file descriptor leak.
---
 lib/stdlib/src/erl_tar.erl    |  6 ++++-
 lib/stdlib/test/tar_SUITE.erl | 59 ++++++++++++++++++++++++++++++-------------
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index 086e77cd2..a54df939b 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -1321,7 +1321,11 @@ foldl_read(TarName, Fun, Accu, #read_opts{}=Opts)
   when is_function(Fun,4) ->
     try open(TarName, [read|Opts#read_opts.open_mode]) of
         {ok, #reader{access=read}=Reader} ->
-            foldl_read(Reader, Fun, Accu, Opts);
+            try
+                foldl_read(Reader, Fun, Accu, Opts)
+            after
+                _ = close(Reader)
+            end;
         {error, _} = Err ->
             Err
     catch
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index d6b6d3f80..2e1ae7bcf 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -20,7 +20,9 @@
 -module(tar_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, borderline/1, atomic/1, long_names/1,
+	 init_per_group/2, end_per_group/2,
+         init_per_testcase/2,
+         borderline/1, atomic/1, long_names/1,
 	 create_long_names/1, bad_tar/1, errors/1, extract_from_binary/1,
 	 extract_from_binary_compressed/1, extract_filtered/1,
 	 extract_from_open_file/1, symlinks/1, open_add_close/1, cooked_compressed/1,
@@ -56,6 +58,9 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_Case, Config) ->
+    Ports = ordsets:from_list(erlang:ports()),
+    [{ports,Ports}|Config].
 
 %% Test creating, listing and extracting one file from an archive,
 %% multiple times with different file sizes.  Also check that the file
@@ -85,7 +90,7 @@ borderline(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([TempDir]),
 
-    ok.
+    verify_ports(Config).
 
 borderline_test(Size, TempDir) ->
     io:format("Testing size ~p", [Size]),
@@ -270,7 +275,7 @@ atomic(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([Tar1,Tar2,Tar3,Tar4|Names]),
 
-    ok.
+    verify_ports(Config).
 
 %% Returns a sequence of characters.
 
@@ -304,7 +309,9 @@ long_names(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     Long = filename:join(DataDir, "long_names.tar"),
     run_in_short_tempdir(Config,
-			 fun() -> do_long_names(Long) end).
+			 fun() -> do_long_names(Long) end),
+    verify_ports(Config).
+
 
 do_long_names(Long) ->
     %% Try table/2 and extract/2.
@@ -336,7 +343,8 @@ do_long_names(Long) ->
 %% Creates a tar file from a deep directory structure (filenames are
 %% longer than 100 characters).
 create_long_names(Config) when is_list(Config) ->
-    run_in_short_tempdir(Config, fun create_long_names/0).
+    run_in_short_tempdir(Config, fun create_long_names/0),
+    verify_ports(Config).
 
 create_long_names() ->
     {ok,Dir} = file:get_cwd(),
@@ -383,7 +391,7 @@ bad_tar(Config) when is_list(Config) ->
     try_bad("bad_octal",    invalid_tar_checksum, Config),
     try_bad("bad_too_short",    eof, Config),
     try_bad("bad_even_shorter", eof, Config),
-    ok.
+    verify_ports(Config).
 
 try_bad(Name0, Reason, Config) ->
     %% Intentionally no macros here.
@@ -433,7 +441,7 @@ errors(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([GoodTar,BadTar]),
 
-    ok.
+    verify_ports(Config).
 
 try_error(M, F, A, Error) ->
     io:format("Trying ~p:~p(~p)", [M, F, A]),
@@ -483,7 +491,7 @@ extract_from_binary(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([ExtractDir]),
 
-    ok.
+    verify_ports(Config).
 
 extract_from_binary_compressed(Config) when is_list(Config) ->
     %% Test extracting a compressed tar archive from a binary.
@@ -516,7 +524,7 @@ extract_from_binary_compressed(Config) when is_list(Config) ->
     %% Clean up the rest.
     delete_files([ExtractDir]),
 
-    ok.
+    verify_ports(Config).
 
 %% Test extracting a tar archive from a binary.
 extract_filtered(Config) when is_list(Config) ->
@@ -537,7 +545,7 @@ extract_filtered(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([ExtractDir]),
 
-    ok.
+    verify_ports(Config).
 
 %% Test extracting a tar archive from an open file.
 extract_from_open_file(Config) when is_list(Config) ->
@@ -562,7 +570,7 @@ extract_from_open_file(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([ExtractDir]),
 
-    ok.
+    verify_ports(Config).
 
 %% Test that archives containing symlinks can be created and extracted.
 symlinks(Config) when is_list(Config) ->
@@ -581,6 +589,7 @@ symlinks(Config) when is_list(Config) ->
 
     %% Clean up.
     delete_files([Dir]),
+    verify_ports(Config),
     Res.
 
 make_symlink(Path, Link) ->
@@ -697,7 +706,8 @@ init(Config) when is_list(Config) ->
     ok = erl_tar:add(Tar, FileOne, []),
     ok = erl_tar:close(Tar),
     {ok, [FileOne]} = erl_tar:table(TarOne),
-    ok.
+
+    verify_ports(Config).
 
 file_op_bad(_) ->
     throw({error, should_never_be_called}).
@@ -751,7 +761,7 @@ open_add_close(Config) when is_list(Config) ->
 
     delete_files(["oac_file","oac_small","oac_big",Dir,AnotherDir,ADir]),
 
-    ok.
+    verify_ports(Config).
 
 oac_files() ->
     Files = [{"oac_file", 1459, $x},
@@ -782,7 +792,8 @@ cooked_compressed(Config) when is_list(Config) ->
 
     %% Clean up.
     delete_files([filename:join(PrivDir, "ddll_SUITE_data")]),
-    ok.
+
+    verify_ports(Config).
 
 %% Test that an archive can be created directly from binaries and
 %% that an archive can be extracted into binaries.
@@ -810,13 +821,15 @@ memory(Config) when is_list(Config) ->
 
     %% Clean up.
     ok = delete_files([Name1,Name2]),
-    ok.
+
+    verify_ports(Config).
 
 read_other_implementations(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     Files = ["v7.tar", "gnu.tar", "bsd.tar",
              "star.tar", "pax_mtime.tar"],
-    do_read_other_implementations(Files, DataDir).
+    do_read_other_implementations(Files, DataDir),
+    verify_ports(Config).
 
 do_read_other_implementations([], _DataDir) ->
     ok;
@@ -836,7 +849,8 @@ sparse(Config) when is_list(Config) ->
     Sparse01 = "sparse01.tar",
     Sparse10Empty = "sparse10_empty.tar",
     Sparse10 = "sparse10.tar",
-    do_sparse([Sparse01Empty, Sparse01, Sparse10Empty, Sparse10], DataDir, PrivDir).
+    do_sparse([Sparse01Empty, Sparse01, Sparse10Empty, Sparse10], DataDir, PrivDir),
+    verify_ports(Config).
 
 do_sparse([], _DataDir, _PrivDir) ->
     ok;
@@ -994,3 +1008,14 @@ is_ustar(File) ->
         $g -> false;
         _ -> true
     end.
+
+
+verify_ports(Config) ->
+    PortsBefore = proplists:get_value(ports, Config),
+    PortsAfter = ordsets:from_list(erlang:ports()),
+    case ordsets:subtract(PortsAfter, PortsBefore) of
+        [] ->
+            ok;
+        [_|_]=Rem ->
+            error({leaked_ports,Rem})
+    end.
-- 
2.12.0

Places

File 2362-erl_tar-Close-files-after-reading-from-a-tar-file.patch of Package erlang (Revision 1df3ed72f7aa9edd3e18418a69795124)

Places