File 0358-Fix-error-message-for-invalid-replacement-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0358-Fix-error-message-for-invalid-replacement-args-in-re.patch of Package erlang (Revision 6af3eea487054748181c35715c642268)

Currently displaying revision 6af3eea487054748181c35715c642268 , Show latest

From ba886139b72186a6322d7a96cbe8c4b180a9a2ed Mon Sep 17 00:00:00 2001
From: Maria Scott <maria-12648430@hnc-agency.org>
Date: Fri, 1 Dec 2023 15:40:05 +0100
Subject: [PATCH] Fix error message for invalid replacement args in re

---
 lib/stdlib/src/erl_stdlib_errors.erl | 29 ++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/lib/stdlib/src/erl_stdlib_errors.erl b/lib/stdlib/src/erl_stdlib_errors.erl
index a90d6477a7..45005047bc 100644
--- a/lib/stdlib/src/erl_stdlib_errors.erl
+++ b/lib/stdlib/src/erl_stdlib_errors.erl
@@ -349,11 +349,11 @@ format_re_error(inspect, [CompiledRE, Item], _) ->
 format_re_error(replace, [Subject, RE, Replacement], _) ->
     [must_be_iodata(Subject),
      must_be_regexp(RE),
-     must_be_iodata(Replacement)];
+     must_be_re_replacement(Replacement)];
 format_re_error(replace, [Subject, RE, Replacement, _Options], Cause) ->
     Errors = [must_be_iodata(Subject),
               must_be_regexp(RE),
-              must_be_iodata(Replacement)],
+              must_be_re_replacement(Replacement)],
     case Cause of
         badopt ->
             Errors ++ [bad_options];
@@ -909,6 +909,15 @@ is_update_op({Pos, Incr, Threshold, SetValue})
 is_update_op(Incr) ->
     is_integer(Incr).
 
+is_iodata(<<_/binary>>) -> true;
+is_iodata(Term) when is_list(Term) ->
+    try iolist_size(Term) of
+        _ -> true
+    catch
+        error:_ -> false
+    end;
+is_iodata(_) -> false.
+
 format_error_map([""|Es], ArgNum, Map) ->
     format_error_map(Es, ArgNum + 1, Map);
 format_error_map([{general, E}|Es], ArgNum, Map) ->
@@ -955,10 +964,9 @@ must_be_non_neg_integer(N) ->
     must_be_integer(N, 0, infinity).
 
 must_be_iodata(Term) ->
-    try iolist_size(Term) of
-        _ -> []
-    catch
-        error:_ -> not_iodata
+    case is_iodata(Term) of
+        true -> [];
+        false -> not_iodata
     end.
 
 must_be_list(List) when is_list(List) ->
@@ -1029,6 +1037,13 @@ must_be_regexp(Term) ->
             end
     end.
 
+must_be_re_replacement(R) when is_function(R, 1) -> [];
+must_be_re_replacement(R) ->
+    case is_iodata(R) of
+        true -> [];
+        false -> bad_replacement
+    end.
+
 expand_error(already_owner) ->
     <<"the process is already the owner of the table">>;
 expand_error(bad_boolean) ->
@@ -1055,6 +1070,8 @@ expand_error(bad_matchspec) ->
     <<"not a valid match specification">>;
 expand_error(bad_options) ->
     <<"invalid options">>;
+expand_error(bad_replacement) ->
+    <<"not a valid replacement">>;
 expand_error(bad_table_name) ->
     <<"invalid table name (must be an atom)">>;
 expand_error(bad_update_op) ->
-- 
2.35.3

Places

File 0358-Fix-error-message-for-invalid-replacement-args-in-re.patch of Package erlang (Revision 6af3eea487054748181c35715c642268)

Places