Merge PR99 and its fixes to support parsing Information Object and Information Object Set
This is a collection of works :
1. Based on @zhanglei002's pull request 99.
2. A fix by @AuthenticEshkinKot and merged by @mouse07410 at
commit 2c8d366bbe1fc4e4c041e9b0eb9779f8a42d754b of https://github.com/mouse07410/asn1c
to support parsing of Information Object and Information Object Set
3. A fix by @Uri Blumenthal in asn1fix_derefv.c at :
commit ec0ade4f87c807e763e3f35fc5466adb6dda3473 of https://github.com/mouse07410/asn1c
to solve crash on asn1p_value_free().
4. My pull request 18 to @mouse07410's https://github.com/mouse07410/asn1c to solve
problems found during parsing ASN.1 modules of S1AP, RANAP and J2735-201603.
5. My pull request 22 to @mouse07410's https://github.com/mouse07410/asn1c to solve issue 147
and to solve the problem during parsing ASN.1 module of NBAP.
6. My pull request 23 to @mouse07410's https://github.com/mouse07410/asn1c to fix memory leakage
introduced in aforementioned commits.
Most code changes are the same as pull request 153 to this repository.
7. A fix of my bug in item 6 which result asn1c crash, fixed by @mouse07410.
diff --git a/libasn1parser/asn1p_class.c b/libasn1parser/asn1p_class.c
index c6e6c3d..4603d18 100644
--- a/libasn1parser/asn1p_class.c
+++ b/libasn1parser/asn1p_class.c
@@ -42,8 +42,20 @@
void
asn1p_ioc_row_delete(asn1p_ioc_row_t *row) {
+ int i;
if(row) {
if(row->column) {
+ for(i = 0; i < row->columns; i++) {
+ if(!row->column[i].new_ref && row->column[i].value) {
+ /*
+ * Field 'reference' comes from asn1fix_cws.c :
+ * TQ_FIRST(&cell->field->members)->reference
+ * so it should not be freed here.
+ */
+ row->column[i].value->reference = NULL;
+ }
+ asn1p_expr_free(row->column[i].value);
+ }
free(row->column);
}
free(row);
@@ -182,6 +194,7 @@
if(wc) {
wc->type = WC_OPTIONALGROUP;
wc->content.syntax = syntax;
+ syntax->parent = wc;
}
return wc;