commit 069c07657e573701efe63c35d7472b0667903752
author Bi-Ruei, Chiu <biruei.chiu@gmail.com> Mon Sep 11 14:09:34 2017 +0800
committer Lev Walkin <vlm@lionet.info> Fri Oct 20 17:15:57 2017 -0700
tree d8af11d5307755bd6a05efec2f786176b3255f18
parent aeff717baffe86ce00b88c271b445b2006e099df

Fix crash during dealing with empty optinal fields of ioc cell

libasn1compiler/asn1c_C.c

diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c
index bebd413..73ccbdd 100644
--- a/libasn1compiler/asn1c_C.c
+++ b/libasn1compiler/asn1c_C.c
@@ -1070,6 +1070,8 @@
         struct asn1p_ioc_cell_s *cell =
             &opt_ioc->ioct->row[row]->column[column_index];
 
+        if(!cell->value) continue;
+
         asn1p_expr_t *m = asn1p_expr_clone(cell->value, 0);
         asn1p_expr_add(open_type_choice, m);
     }

libasn1compiler/asn1c_ioc.c

diff --git a/libasn1compiler/asn1c_ioc.c b/libasn1compiler/asn1c_ioc.c
index 02e37a7..bb72f7d 100644
--- a/libasn1compiler/asn1c_ioc.c
+++ b/libasn1compiler/asn1c_ioc.c
@@ -213,7 +213,9 @@
 emit_ioc_cell(arg_t *arg, struct asn1p_ioc_cell_s *cell) {
     OUT("{ \"%s\", ", cell->field->Identifier);
 
-    if(cell->value->meta_type == AMT_VALUE) {
+    if(!cell->value) {
+        /* Ignore */
+    } else if(cell->value->meta_type == AMT_VALUE) {
         GEN_INCLUDE(asn1c_type_name(arg, cell->value, TNF_INCLUDE));
         OUT("aioc__value, ");
         OUT("&asn_DEF_%s, ", asn1c_type_name(arg, cell->value, TNF_SAFE));