File 1275-epp-Fix-error-return-for-an-incorrect-prep... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1275-epp-Fix-error-return-for-an-incorrect-preprocessor-i.patch of Package erlang (Revision a6074ec17c0b82ee6cb839121f95e064)

Currently displaying revision a6074ec17c0b82ee6cb839121f95e064 , Show latest

From f932c79a121a54fbf47c69e282b0933d5a694d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 26 Aug 2020 06:01:38 +0200
Subject: [PATCH] epp: Fix error return for an incorrect preprocessor -if
 directive

Referencing an undefined preprocessor symbol in an `-if` directive
would return an invalid error term not recognized by
`epp:format_error/1`.

https://bugs.erlang.org/browse/ERL-1310
---
 lib/stdlib/src/epp.erl        |  2 ++
 lib/stdlib/test/epp_SUITE.erl | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 181a524db6..92b43a89ce 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1106,6 +1106,8 @@ scan_if([{'(',_}|_]=Toks, If, From, St) ->
 	    Error = case Error0 of
 			{_,erl_parse,_} ->
 			    {error,Error0};
+                        {error,ErrL,What} ->
+                            {error,{ErrL,epp,What}};
 			_ ->
 			    {error,{loc(If),epp,Error0}}
 		    end,
-- 
2.26.2

Places

File 1275-epp-Fix-error-return-for-an-incorrect-preprocessor-i.patch of Package erlang (Revision a6074ec17c0b82ee6cb839121f95e064)

Places