read term file using with_handle/1

(cherry picked from commit 365de60c248407fef6261c5eddd6eb235bdf5da8)

1 files changed, 16 insertions, 13 deletions

diff --git a/deps/rabbit/src/rabbit_file.erl b/deps/rabbit/src/rabbit_file.erl
index 6f2ae5e6a5..2060c354c5 100644
--- a/deps/rabbit/src/rabbit_file.erl
+++ b/deps/rabbit/src/rabbit_file.erl
@@ -90,19 +90,22 @@ read_file_info(File) ->
 
 read_term_file(File) ->
     try
-        {ok, FInfo} = file:read_file_info(File, [raw]),
-        {ok, Fd} = file:open(File, [read, raw, binary]),
-        try
-            {ok, Data} = file:read(Fd, FInfo#file_info.size),
-            {ok, Tokens, _} = erl_scan:string(binary_to_list(Data)),
-            TokenGroups = group_tokens(Tokens),
-            {ok, [begin
-                    {ok, Term} = erl_parse:parse_term(Tokens1),
-                    Term
-                end || Tokens1 <- TokenGroups]}
-        after
-            ok = file:close(Fd)
-        end
+        F = fun() ->
+                    {ok, FInfo} = file:read_file_info(File, [raw]),
+                    {ok, Fd} = file:open(File, [read, raw, binary]),
+                    try
+                        file:read(Fd, FInfo#file_info.size)
+                    after
+                        file:close(Fd)
+                    end
+            end,
+        {ok, Data} = with_handle(F),
+        {ok, Tokens, _} = erl_scan:string(binary_to_list(Data)),
+        TokenGroups = group_tokens(Tokens),
+        {ok, [begin
+                  {ok, Term} = erl_parse:parse_term(Tokens1),
+                  Term
+              end || Tokens1 <- TokenGroups]}
     catch
         error:{badmatch, Error} -> Error
     end.