osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
10
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix parsing for OID and RELATIVE-OID

aper
Lev Walkin 2012-09-04 14:56:27 -07:00
parent 46dac08273
commit aed43c8bcc
10 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asn1c/tests/data-70/data-70-55.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid>123.456.789.101112</roid>
</set>
</PDU>

5
asn1c/tests/data-70/data-70-56.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid> 123.456.789.101112 </roid>
</set>
</PDU>

5
asn1c/tests/data-70/data-70-57-D.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid> <!--/--> 123.456.789.101112</roid>
</set>
</PDU>

5
asn1c/tests/data-70/data-70-58-D.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid>123.456.789.101112<!--/--></roid>
</set>
</PDU>

5
asn1c/tests/data-70/data-70-59-D.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid>123.456.789.101112<!--/--> </roid>
</set>
</PDU>

5
asn1c/tests/data-70/data-70-60-D.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid>123.456.789.101112 <!--/--></roid>
</set>
</PDU>

5
asn1c/tests/data-70/data-70-61-D.in Normal file
View File

@ -0,0 +1,5 @@
<PDU>
<set>
<roid>123.456.789.101112 <!--/--> </roid>
</set>
</PDU>

9
asn1c/tests/data-70/data-70-62-D.in Normal file
View File

@ -0,0 +1,9 @@
<PDU>
<set>
<roid>
<!-- This is a special comment -->
123.456.789.101112
<!-- This is a special comment too -->
</roid>
</set>
</PDU>

23
skeletons/OBJECT_IDENTIFIER.c
View File

@ -282,15 +282,13 @@ OBJECT_IDENTIFIER__xer_body_decode(asn_TYPE_descriptor_t *td, void *sptr, const
arcs_count = OBJECT_IDENTIFIER_parse_arcs(
(const char *)chunk_buf, chunk_size, arcs,
sizeof(s_arcs)/sizeof(s_arcs[0]), &endptr);
if(arcs_count <= 0) {
if(arcs_count < 0) {
/* Expecting more than zero arcs */
return XPBD_BROKEN_ENCODING;
} else if(arcs_count == 0) {
return XPBD_NOT_BODY_IGNORE;
}
if(endptr < chunk_end) {
/* We have a tail of unrecognized data. Check its safety. */
if(!xer_is_whitespace(endptr, chunk_end - endptr))
return XPBD_BROKEN_ENCODING;
}
assert(endptr == chunk_end);
if((size_t)arcs_count > sizeof(s_arcs)/sizeof(s_arcs[0])) {
arcs = (long *)MALLOC(arcs_count * sizeof(long));
@ -745,16 +743,19 @@ OBJECT_IDENTIFIER_parse_arcs(const char *oid_text, ssize_t oid_txt_length,
/* Finalize last arc */
switch(state) {
case ST_LEADSPACE:
case ST_WAITDIGITS:
errno = EINVAL;
return -1;
return 0; /* No OID found in input data */
case ST_DIGITS:
_OID_CAPTURE_ARC(value_start, oid_text);
/* Fall through */
return arcs_count;
case ST_WAITDIGITS:
errno = EINVAL; /* Broken OID */
return -1;
case ST_TAILSPACE:
default:
return arcs_count;
}
errno = EINVAL; /* Broken OID */
return -1;
}

10
skeletons/RELATIVE-OID.c
View File

@ -106,14 +106,12 @@ RELATIVE_OID__xer_body_decode(asn_TYPE_descriptor_t *td, void *sptr, const void
(const char *)chunk_buf, chunk_size,
arcs, sizeof(s_arcs)/sizeof(s_arcs[0]), &endptr);
if(arcs_count < 0) {
/* Expecting at least zero arcs */
/* Expecting at least one arc arcs */
return XPBD_BROKEN_ENCODING;
} else if(arcs_count == 0) {
return XPBD_NOT_BODY_IGNORE;
}
if(endptr < chunk_end) {
/* We have a tail of unrecognized data. Check its safety. */
if(!xer_is_whitespace(endptr, chunk_end - endptr))
return XPBD_BROKEN_ENCODING;
}
assert(endptr == chunk_end);
if((size_t)arcs_count > sizeof(s_arcs)/sizeof(s_arcs[0])) {
arcs = (long *)MALLOC(arcs_count * sizeof(long));