From 1a2a36794f1913b5a813c133bdfb9eea74d0a386 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 21 Nov 2017 16:25:31 +0100
Subject: asn1: Protect more by try..catch

---
 lib/asn1/src/asn1ct_gen.erl | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 806f8420ec..bd50a1ee18 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -707,6 +707,7 @@ gen_exports([_|_]=L0, Prefix, Arity) ->
 pgen_dispatcher(Erules, []) ->
     gen_info_functions(Erules);
 pgen_dispatcher(Gen, Types) ->
+    %% MODULE HEAD
     emit(["-export([encode/2,decode/2]).",nl,nl]),
     gen_info_functions(Gen),
 
@@ -714,6 +715,7 @@ pgen_dispatcher(Gen, Types) ->
     NoFinalPadding = lists:member(no_final_padding, Options),
     NoOkWrapper = proplists:get_bool(no_ok_wrapper, Options),
 
+    %% ENCODER
     Call = case Gen of
 	       #gen{erule=per,aligned=true} ->
 		   asn1ct_func:need({per,complete,1}),
@@ -740,6 +742,7 @@ pgen_dispatcher(Gen, Types) ->
     end,
     emit([nl,nl]),
 
+    %% DECODER
     ReturnRest = proplists:get_bool(undec_rest, Gen#gen.options),
     Data = case Gen#gen.erule =:= ber andalso ReturnRest of
 	       true -> "Data0";
@@ -747,6 +750,12 @@ pgen_dispatcher(Gen, Types) ->
 	   end,
 
     emit(["decode(Type, ",Data,") ->",nl]),
+
+    case NoOkWrapper of
+        false -> emit(["try",nl," case",nl,"  begin",nl]);
+        true -> emit(["case",nl,"  begin"])
+    end,
+
     DecWrap =
 	case {Gen,ReturnRest} of
 	    {#gen{erule=ber},false} ->
@@ -754,20 +763,18 @@ pgen_dispatcher(Gen, Types) ->
 		"element(1, ber_decode_nif(Data))";
 	    {#gen{erule=ber},true} ->
 		asn1ct_func:need({ber,ber_decode_nif,1}),
-		emit(["{Data,Rest} = ber_decode_nif(Data0),",nl]),
+		emit(["   {Data,Rest} = ber_decode_nif(Data0),",nl]),
 		"Data";
 	    {_,_} ->
 		"Data"
 	end,
-    emit([case NoOkWrapper of
-	      false -> "try";
-	      true -> "case"
-	  end, " decode_disp(Type, ",DecWrap,") of",nl]),
+
+    emit(["   decode_disp(Type, ",DecWrap,")",nl,"  end of",nl]),
     case Gen of
 	#gen{erule=ber} ->
-	    emit(["  Result ->",nl]);
+	    emit(["   Result ->",nl]);
 	#gen{erule=per} ->
-	    emit(["  {Result,Rest} ->",nl])
+	    emit(["   {Result,Rest} ->",nl])
     end,
     case ReturnRest of
 	false -> result_line(NoOkWrapper, ["Result"]);
@@ -775,11 +782,12 @@ pgen_dispatcher(Gen, Types) ->
     end,
     case NoOkWrapper of
 	false ->
-	    emit([nl,try_catch(),nl,nl]);
+	    emit([nl,"  end",nl,try_catch(),nl,nl]);
 	true ->
 	    emit([nl,"end.",nl,nl])
     end,
 
+    %% REST of MODULE
     gen_decode_partial_incomplete(Gen),
     gen_partial_inc_dispatcher(Gen),
 
-- 
cgit v1.2.3


From 93365f0ed71323e4e5475dd7c68d18ab2a83f7e5 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 21 Nov 2017 20:08:25 +0100
Subject: asn1: Further adjustments on generated code

---
 lib/asn1/src/asn1ct_gen.erl | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index bd50a1ee18..da9f6ac559 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -752,8 +752,8 @@ pgen_dispatcher(Gen, Types) ->
     emit(["decode(Type, ",Data,") ->",nl]),
 
     case NoOkWrapper of
-        false -> emit(["try",nl," case",nl,"  begin",nl]);
-        true -> emit(["case",nl,"  begin"])
+        false -> emit(["try",nl]);
+        true -> ok
     end,
 
     DecWrap =
@@ -769,22 +769,29 @@ pgen_dispatcher(Gen, Types) ->
 		"Data"
 	end,
 
-    emit(["   decode_disp(Type, ",DecWrap,")",nl,"  end of",nl]),
-    case Gen of
-	#gen{erule=ber} ->
-	    emit(["   Result ->",nl]);
-	#gen{erule=per} ->
-	    emit(["   {Result,Rest} ->",nl])
-    end,
-    case ReturnRest of
-	false -> result_line(NoOkWrapper, ["Result"]);
-	true ->  result_line(NoOkWrapper, ["Result","Rest"])
+    DecodeDisp = ["decode_disp(Type, ",DecWrap,")"],
+    case {Gen,ReturnRest} of
+	{#gen{erule=ber},true} ->
+	    emit(["   Result = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result","Rest"]);
+	{#gen{erule=ber},false} ->
+	    emit(["   Result = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result"]);
+
+
+	{#gen{erule=per},true} ->
+	    emit(["   {Result,Rest} = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result","Rest"]);
+	{#gen{erule=per},false} ->
+	    emit(["   {Result,_Rest} = ",DecodeDisp,",",nl]),
+            result_line(NoOkWrapper, ["Result"])
     end,
+
     case NoOkWrapper of
 	false ->
-	    emit([nl,"  end",nl,try_catch(),nl,nl]);
+	    emit([nl,try_catch(),nl,nl]);
 	true ->
-	    emit([nl,"end.",nl,nl])
+	    emit([".",nl,nl])
     end,
 
     %% REST of MODULE
@@ -795,7 +802,7 @@ pgen_dispatcher(Gen, Types) ->
     gen_dispatcher(Types, "decode_disp", "dec_").
 
 result_line(NoOkWrapper, Items) ->
-    S = ["    "|case NoOkWrapper of
+    S = ["   "|case NoOkWrapper of
 		    false -> result_line_1(["ok"|Items]);
 		    true -> result_line_1(Items)
 		end],
-- 
cgit v1.2.3