File 0128-erts-Fix-crash-on-exceptions-with-huge-lin... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0128-erts-Fix-crash-on-exceptions-with-huge-line-numbers.patch of Package erlang (Revision 31aed6575abf830123194bb955e96447)

Currently displaying revision 31aed6575abf830123194bb955e96447 , Show latest

From eae009fc8f05d2a90d9dad43c45fed0a058e0bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Thu, 14 Oct 2021 21:25:53 +0200
Subject: [PATCH] erts: Fix crash on exceptions with huge line numbers

Unrepresentable locations should be ignored, but I forgot to bring
that over when rewriting the loader in OTP 24.

To prevent something like this from happening again, ignore them in
the MAKE_LOCATION macro rather than around each use.
---
 erts/emulator/beam/beam_code.h         |  6 +++++-
 erts/emulator/test/exception_SUITE.erl | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/erts/emulator/beam/beam_code.h b/erts/emulator/beam/beam_code.h
index 3465c4e6ef..0ef5bf6471 100644
--- a/erts/emulator/beam/beam_code.h
+++ b/erts/emulator/beam/beam_code.h
@@ -29,7 +29,11 @@
 
 #define IS_VALID_LOCATION(File, Line) \
     ((unsigned) (File) < 255 && (unsigned) (Line) < ((1 << 24) - 1))
-#define MAKE_LOCATION(File, Line) (((File) << 24) | (Line))
+/* Builds a location entry, silently ignoring unrepresentable locations. */
+#define MAKE_LOCATION(File, Line)        \
+    (IS_VALID_LOCATION((File), (Line)) ? \
+        (((File) << 24) | (Line)) :      \
+        LINE_INVALID_LOCATION)
 #define LOC_FILE(Loc) ((Loc) >> 24)
 #define LOC_LINE(Loc) ((Loc) & ((1 << 24)-1))
 
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index 746993bf34..49b46d5b9e 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -1549,6 +1549,13 @@ line_numbers(Config) when is_list(Config) ->
               {?MODULE,test_tl,1,[{file,"list_bifs.erl"},{line,102}]}|_]}} =
         (catch test_tl(y)),
 
+    %% This line number is too large to be represented and will be silently
+    %% ignored by the emulator.
+    {'EXIT',{crash,
+             [{?MODULE,crash_huge_line,1,[]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+        (catch crash_huge_line(gurka)),
+
     ok.
 
 id(I) -> I.
@@ -1671,3 +1678,8 @@ update_map(M0) ->                               %Line 2
 test_hd(X) -> foo(), hd(X).                     %Line 101
 test_tl(X) -> foo(), tl(X).                     %Line 102
 foo() -> id(100).
+
+-file("huge_lines.erl", 1600000000).            %Line 1600000000
+
+crash_huge_line(_) ->                           %Line 1600000002
+    erlang:error(crash).                        %Line 1600000003
-- 
2.31.1

Places

File 0128-erts-Fix-crash-on-exceptions-with-huge-line-numbers.patch of Package erlang (Revision 31aed6575abf830123194bb955e96447)

Places