File 1149-asn1-Silence-CodeChecker-in-ber_encode.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1149-asn1-Silence-CodeChecker-in-ber_encode.patch of Package erlang

From 642bb8ebd2b4d7afb5b61d2f0ba8a0a3e435a3ca Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 23 Feb 2021 11:29:46 +0100
Subject: [PATCH 09/10] asn1: Silence CodeChecker in ber_encode

ber_encode could be called with *curr==NULL from ber_new_chunk.
---
 lib/asn1/c_src/asn1_erl_nif.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/asn1/c_src/asn1_erl_nif.c b/lib/asn1/c_src/asn1_erl_nif.c
index da43af3405..e9c597f842 100644
--- a/lib/asn1/c_src/asn1_erl_nif.c
+++ b/lib/asn1/c_src/asn1_erl_nif.c
@@ -1280,17 +1280,20 @@ static ERL_NIF_TERM encode_ber_tlv(ErlNifEnv* env, int argc,
     ERL_NIF_TERM err_code;
 
     curr = ber_new_chunk(40);
+    if (!curr) {
+        err_code = enif_make_atom(env,"oom");
+        goto err;
+    }
 
-    if ((encode_err = ber_encode(env, argv[0], &curr, &length))
-	    <= ASN1_ERROR) {
-	ber_free_chunks(curr);
+    encode_err = ber_encode(env, argv[0], &curr, &length);
+    if (encode_err <= ASN1_ERROR) {
 	err_code = enif_make_int(env, encode_err);
-	return enif_make_tuple2(env, enif_make_atom(env, "error"), err_code);
+	goto err;
     }
 
     if (!enif_alloc_binary(length, &out_binary)) {
-	ber_free_chunks(curr);
-	return enif_make_tuple2(env, enif_make_atom(env, "error"), enif_make_atom(env,"oom"));
+        err_code = enif_make_atom(env,"oom");
+        goto err;
     }
 
     top = curr;
@@ -1306,6 +1309,10 @@ static ERL_NIF_TERM encode_ber_tlv(ErlNifEnv* env, int argc,
     ber_free_chunks(top);
 
     return enif_make_binary(env, &out_binary);
+
+ err:
+    ber_free_chunks(curr);
+    return enif_make_tuple2(env, enif_make_atom(env, "error"), err_code);
 }
 
 static int is_ok_load_info(ErlNifEnv* env, ERL_NIF_TERM load_info) {
-- 
2.26.2

Places

File 1149-asn1-Silence-CodeChecker-in-ber_encode.patch of Package erlang

Places