From 70caf52f1a7e09569c776bb1f99b0bf4737c63c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 10 Jan 2013 12:15:43 +0100
Subject: Correct error handling for the NIF functions

Also make sure that the error handling is contained within the
asn1rt_nif module and does not leak out to generated code.
---
 lib/asn1/c_src/asn1_erl_nif.c | 47 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

(limited to 'lib/asn1/c_src')

diff --git a/lib/asn1/c_src/asn1_erl_nif.c b/lib/asn1/c_src/asn1_erl_nif.c
index dbff14f9b3..73323534d2 100644
--- a/lib/asn1/c_src/asn1_erl_nif.c
+++ b/lib/asn1/c_src/asn1_erl_nif.c
@@ -27,7 +27,6 @@
 #define ASN1_OK 0
 #define ASN1_ERROR -1
 #define ASN1_COMPL_ERROR 1
-#define ASN1_MEMORY_ERROR 0
 #define ASN1_DECODE_ERROR 2
 #define ASN1_TAG_ERROR -3
 #define ASN1_LEN_ERROR -4
@@ -1221,7 +1220,33 @@ static ERL_NIF_TERM encode_per_complete(ErlNifEnv* env, int argc,
     return enif_make_binary(env, &out_binary);
 }
 
-static ERL_NIF_TERM decode_ber_tlv(ErlNifEnv* env, int argc,
+static ERL_NIF_TERM
+make_ber_error_term(ErlNifEnv* env, unsigned int return_code,
+		    unsigned int err_pos)
+{
+    ERL_NIF_TERM reason;
+    ERL_NIF_TERM t;
+
+    switch (return_code) {
+    case ASN1_TAG_ERROR:
+	reason = enif_make_atom(env, "invalid_tag");
+	break;
+    case ASN1_LEN_ERROR:
+    case ASN1_INDEF_LEN_ERROR:
+	reason = enif_make_atom(env, "invalid_length");
+	break;
+    case ASN1_VALUE_ERROR:
+	reason = enif_make_atom(env, "invalid_value");
+	break;
+    default:
+	reason = enif_make_atom(env, "unknown");
+	break;
+    }
+    t = enif_make_tuple2(env, reason, enif_make_int(env, err_pos));
+    return enif_make_tuple2(env, enif_make_atom(env, "error"), t);
+}
+
+static ERL_NIF_TERM decode_ber_tlv_raw(ErlNifEnv* env, int argc,
 	const ERL_NIF_TERM argv[]) {
     ErlNifBinary in_binary;
     ERL_NIF_TERM return_term;
@@ -1230,11 +1255,11 @@ static ERL_NIF_TERM decode_ber_tlv(ErlNifEnv* env, int argc,
     if (!enif_inspect_iolist_as_binary(env, argv[0], &in_binary))
 	return enif_make_badarg(env);
 
-    if ((return_code = ber_decode_begin(env, &return_term, in_binary.data,
-	    in_binary.size, &err_pos)) != ASN1_OK
-    )
-	return enif_make_tuple2(env, enif_make_atom(env,"error"), enif_make_tuple2(env,
-			enif_make_int(env, return_code),enif_make_int(env, err_pos)));
+    return_code = ber_decode_begin(env, &return_term, in_binary.data,
+				   in_binary.size, &err_pos);
+    if (return_code != ASN1_OK) {
+	return make_ber_error_term(env, return_code, err_pos);
+    }
     return return_term;
 }
 
@@ -1297,8 +1322,10 @@ static void unload(ErlNifEnv* env, void* priv_data) {
 
 }
 
-static ErlNifFunc nif_funcs[] = { { "encode_per_complete", 1,
-	encode_per_complete }, { "decode_ber_tlv", 1, decode_ber_tlv }, {
-	"encode_ber_tlv", 1, encode_ber_tlv } };
+static ErlNifFunc nif_funcs[] =  {
+    { "encode_per_complete", 1, encode_per_complete },
+    { "decode_ber_tlv_raw", 1, decode_ber_tlv_raw },
+    { "encode_ber_tlv", 1, encode_ber_tlv },
+};
 
 ERL_NIF_INIT(asn1rt_nif, nif_funcs, load, NULL, upgrade, unload)
-- 
cgit v1.2.3