Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
asn1c
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
asn1c
Commits
aed43c8b
Commit
aed43c8b
authored
Sep 04, 2012
by
Lev Walkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix parsing for OID and RELATIVE-OID
parent
46dac082
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
60 additions
and
17 deletions
+60
-17
asn1c/tests/data-70/data-70-55.in
asn1c/tests/data-70/data-70-55.in
+5
-0
asn1c/tests/data-70/data-70-56.in
asn1c/tests/data-70/data-70-56.in
+5
-0
asn1c/tests/data-70/data-70-57-D.in
asn1c/tests/data-70/data-70-57-D.in
+5
-0
asn1c/tests/data-70/data-70-58-D.in
asn1c/tests/data-70/data-70-58-D.in
+5
-0
asn1c/tests/data-70/data-70-59-D.in
asn1c/tests/data-70/data-70-59-D.in
+5
-0
asn1c/tests/data-70/data-70-60-D.in
asn1c/tests/data-70/data-70-60-D.in
+5
-0
asn1c/tests/data-70/data-70-61-D.in
asn1c/tests/data-70/data-70-61-D.in
+5
-0
asn1c/tests/data-70/data-70-62-D.in
asn1c/tests/data-70/data-70-62-D.in
+9
-0
skeletons/OBJECT_IDENTIFIER.c
skeletons/OBJECT_IDENTIFIER.c
+12
-11
skeletons/RELATIVE-OID.c
skeletons/RELATIVE-OID.c
+4
-6
No files found.
asn1c/tests/data-70/data-70-55.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid>123.456.789.101112</roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-56.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid> 123.456.789.101112 </roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-57-D.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid> <!--/--> 123.456.789.101112</roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-58-D.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid>123.456.789.101112<!--/--></roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-59-D.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid>123.456.789.101112<!--/--> </roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-60-D.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid>123.456.789.101112 <!--/--></roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-61-D.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid>123.456.789.101112 <!--/--> </roid>
</set>
</PDU>
asn1c/tests/data-70/data-70-62-D.in
0 → 100644
View file @
aed43c8b
<PDU>
<set>
<roid>
<!-- This is a special comment -->
123.456.789.101112
<!-- This is a special comment too -->
</roid>
</set>
</PDU>
skeletons/OBJECT_IDENTIFIER.c
View file @
aed43c8b
...
...
@@ -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
;
}
skeletons/RELATIVE-OID.c
View file @
aed43c8b
...
...
@@ -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
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment