Merge branch 'bjorn/asn1/minor-fixes'

* bjorn/asn1/minor-fixes: (21 commits)
  Always inline decoding of open types
  Eliminate code duplication
  per: Slightly optimize encoding of fixed OCTET STRINGs
  per: Fix encoding of OCTET STRINGs with fixed length of 256 or more
  Remove support for the {Typename,Value} notation in encoding
  asn1ct_parser2: Let synonyms share parsing code
  Add a test case for constraint equivalence
  Make .abs file consultable
  Fix a bug in skipping of extensions
  asn1rt_uper_bin: Correct incorrect skipping of extensions
  asn1 doc: Remove a reference to a section that has been removed
  Simplify testConstraints by introducing helper functions
  Simplify testCompactBitString by introducing roundtrip functions
  Simplify testEnumExt by introducing a roundtrip/2 function
  Simplify testChoExternal by introducing a roundtrip/2 function
  Simplify testChoRecursive by introducing a roundtrip/2 function
  Simplify testSeqExtension.erl by introducing a roundtrip/2 function
  Simplify testChoExtension by introducing a roundtrip/2 function
  Simplify testSetOptional by introducing a roundtrip/2 function
  testSetOptional: Correct test case for decoding of corrupt data
  ...

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/asn1/src/asn1rt_uper_bin.erl b/lib/asn1/src/asn1rt_uper_bin.erl
index 9410c3ef90..fc65d80245 100644
--- a/lib/asn1/src/asn1rt_uper_bin.erl
+++ b/lib/asn1/src/asn1rt_uper_bin.erl
@@ -120,14 +120,15 @@ fixextensions(Pos,ExtPos,Val,Acc) ->
 	  end,
     fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
 
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
+skipextensions(Bytes,Nr,ExtensionBitstr) when is_bitstring(ExtensionBitstr) ->
+    Prev = Nr - 1,
+    case ExtensionBitstr of
+	<<_:Prev,1:1,_/bitstring>> ->
 	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
+	    skipextensions(Bytes2, Nr+1, ExtensionBitstr);
+	<<_:Prev,0:1,_/bitstring>> ->
+	    skipextensions(Bytes, Nr+1, ExtensionBitstr);
+	_ ->
 	    Bytes
     end.