Commit 2e5caa51 authored by Lev Walkin's avatar Lev Walkin

oer open type fix

parent 8ac82227
...@@ -36,8 +36,7 @@ OPEN_TYPE_oer_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ...@@ -36,8 +36,7 @@ OPEN_TYPE_oer_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
} }
if(*memb_ptr2 != NULL) { if(*memb_ptr2 != NULL) {
/* Make sure we reset the structure first before encoding */ /* Make sure we reset the structure first before encoding */
if(CHOICE_variant_set_presence(selected.type_descriptor, *memb_ptr2, 0) if(CHOICE_variant_set_presence(elm->type, *memb_ptr2, 0) != 0) {
!= 0) {
ASN__DECODE_FAILED; ASN__DECODE_FAILED;
} }
} }
...@@ -50,7 +49,7 @@ OPEN_TYPE_oer_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ...@@ -50,7 +49,7 @@ OPEN_TYPE_oer_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
&inner_value, ptr, size); &inner_value, ptr, size);
switch(ot_ret) { switch(ot_ret) {
default: default:
if(CHOICE_variant_set_presence(selected.type_descriptor, *memb_ptr2, if(CHOICE_variant_set_presence(elm->type, *memb_ptr2,
selected.presence_index) selected.presence_index)
== 0) { == 0) {
rv.code = RC_OK; rv.code = RC_OK;
...@@ -62,7 +61,7 @@ OPEN_TYPE_oer_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, ...@@ -62,7 +61,7 @@ OPEN_TYPE_oer_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
/* Fall through */ /* Fall through */
case -1: case -1:
rv.code = RC_FAIL; rv.code = RC_FAIL;
rv.consumed = 0; rv.consumed = ot_ret;
break; break;
case 0: case 0:
rv.code = RC_WMORE; rv.code = RC_WMORE;
......
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