Skip to content

A
asn1c
Commit 29a82196 authored by Lev Walkin's avatar Lev Walkin
Browse files
Options

deeper validation;

parent 7ef83a45
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
tests/42-real-life-OK.asn1.-PR
View file @ 29a82196
...@@ -58,8 +58,9 @@ memb_varsets_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -58,8 +58,9 @@ memb_varsets_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
} }
if((size >= 1)) { if((size >= 1)) {
/* Constraint check succeeded */ /* SEQUENCE validation code is the same as SET */
return 0; /* Perform validation of the inner elements */
return SET_OF_constraint(td, list, app_errlog, app_key);
} else { } else {
_ASN_ERRLOG(app_errlog, app_key, _ASN_ERRLOG(app_errlog, app_key,
"%s: constraint failed (%s:%d)", "%s: constraint failed (%s:%d)",
...@@ -395,8 +396,8 @@ memb_vset_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -395,8 +396,8 @@ memb_vset_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
} }
if((size >= 1)) { if((size >= 1)) {
/* Constraint check succeeded */ /* Perform validation of the inner elements */
return 0; return SET_OF_constraint(td, list, app_errlog, app_key);
} else { } else {
_ASN_ERRLOG(app_errlog, app_key, _ASN_ERRLOG(app_errlog, app_key,
"%s: constraint failed (%s:%d)", "%s: constraint failed (%s:%d)",
...@@ -630,7 +631,7 @@ accept_as_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { ...@@ -630,7 +631,7 @@ accept_as_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements; td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count; td->elements_count = asn_DEF_ENUMERATED.elements_count;
/* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
} }
static void static void
......
tests/66-ref-simple-OK.asn1.-P
View file @ 29a82196
...@@ -111,7 +111,7 @@ SimpleType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { ...@@ -111,7 +111,7 @@ SimpleType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements; td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count; td->elements_count = asn_DEF_ENUMERATED.elements_count;
/* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
} }
void void
......
tests/70-xer-test-OK.asn1.-P
View file @ 29a82196
...@@ -432,7 +432,7 @@ enum_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { ...@@ -432,7 +432,7 @@ enum_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements; td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count; td->elements_count = asn_DEF_ENUMERATED.elements_count;
/* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
} }
static void static void
...@@ -836,7 +836,7 @@ Member_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { ...@@ -836,7 +836,7 @@ Member_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements; td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count; td->elements_count = asn_DEF_ENUMERATED.elements_count;
/* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
} }
static void static void
......
tests/73-circular-OK.asn1.-P
View file @ 29a82196
...@@ -683,7 +683,7 @@ EnumType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { ...@@ -683,7 +683,7 @@ EnumType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
td->elements = asn_DEF_ENUMERATED.elements; td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count; td->elements_count = asn_DEF_ENUMERATED.elements_count;
/* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */ /* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
} }
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment