From 55f6965558bed5bfbcf178d0203b7311b447b81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 15 Oct 2014 12:10:00 +0200
Subject: Handle CLASS.&field when checking values

---
 lib/asn1/src/asn1ct_check.erl            |  8 +++++++-
 lib/asn1/test/asn1_SUITE_data/InfObj.asn | 24 ++++++++++++++++++++++++
 lib/asn1/test/testInfObj.erl             |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 996c040373..9af88166e8 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -2079,7 +2079,13 @@ check_valuedef(#state{recordtopname=TopName}=S0, V0) ->
 	    case Type of
 		#classdef{} ->
 		    throw({objectdef});
-		#typedef{typespec=TypeSpec} ->
+		#typedef{typespec=TypeSpec0}=TypeDef ->
+		    TypeSpec = try check_type(S2, TypeDef, TypeSpec0) of
+				   TypeSpec1 -> TypeSpec1
+			       catch
+				   throw:{asn1_class,_} ->
+				       throw({objectdef})
+			       end,
 		    S3 = case is_contextswitchtype(Type) of
 			     true ->
 				 S2;
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index b24d747f0e..9dbee3f516 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -380,6 +380,30 @@ value-1 OBJECT IDENTIFIER ::= obj1.&id
 value-3 RELATIVE-OID ::= obj1.&rid
 value-4 OBJECT IDENTIFIER ::= { 1 2 value-3 }
 
+
+-- Test an obscure issue when ATTRIBUTE.&id was not
+-- properly evaluated.
+
+Rdn ::= SingleAttribute { {SupportedAttributes} }
+
+ATTRIBUTE ::= CLASS {
+   &id             OBJECT IDENTIFIER UNIQUE,
+   &Type           OPTIONAL
+}
+
+SingleAttribute{ATTRIBUTE:AttrSet} ::= SEQUENCE {
+   type      ATTRIBUTE.&id({AttrSet}),
+   value     ATTRIBUTE.&Type({AttrSet}{@type})
+}
+
+AttributeType ::= ATTRIBUTE.&id
+
+SupportedAttributes ATTRIBUTE ::= { at-name }
+
+id-at OBJECT IDENTIFIER ::= { 2 5 4 41 }
+id-at-name AttributeType ::= id-at
+at-name ATTRIBUTE ::= { &Type PrintableString, &id id-at-name }
+
 END
 
 
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index aa617b632f..09fe549f0d 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -151,6 +151,8 @@ main(_Erule) ->
     {100,101} = 'InfObj':'value-3'(),
     {1,2,100,101} = 'InfObj':'value-4'(),
 
+    roundtrip('InfObj', 'Rdn', {'Rdn',{2,5,4,41},"abc"}),
+
     ok.
 
 test_objset(Type, Keys) ->
-- 
cgit v1.2.3