Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libplist
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pwn
libplist
Commits
3ca4f0ae
Commit
3ca4f0ae
authored
Feb 03, 2017
by
Nikias Bassen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bplist: Unify size node parsing for data/string/array/dict nodes
parent
4765d9a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
45 deletions
+24
-45
bplist.c
src/bplist.c
+24
-45
No files found.
src/bplist.c
View file @
3ca4f0ae
...
...
@@ -516,6 +516,29 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
size
=
(
**
object
)
&
BPLIST_FILL
;
(
*
object
)
++
;
if
(
size
==
BPLIST_FILL
)
{
switch
(
type
)
{
case
BPLIST_DATA
:
case
BPLIST_STRING
:
case
BPLIST_UNICODE
:
case
BPLIST_ARRAY
:
case
BPLIST_SET
:
case
BPLIST_DICT
:
{
uint16_t
next_size
=
**
object
&
BPLIST_FILL
;
if
((
**
object
&
BPLIST_MASK
)
!=
BPLIST_UINT
)
return
NULL
;
(
*
object
)
++
;
next_size
=
1
<<
next_size
;
size
=
UINT_TO_HOST
(
*
object
,
next_size
);
(
*
object
)
+=
next_size
;
break
;
}
default:
break
;
}
}
switch
(
type
)
{
...
...
@@ -564,58 +587,22 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
return
parse_date_node
(
object
,
size
);
case
BPLIST_DATA
:
if
(
BPLIST_FILL
==
size
)
{
uint8_t
next_size
=
**
object
&
BPLIST_FILL
;
if
((
**
object
&
BPLIST_MASK
)
!=
BPLIST_UINT
)
return
NULL
;
(
*
object
)
++
;
size
=
UINT_TO_HOST
(
*
object
,
(
1
<<
next_size
));
(
*
object
)
+=
(
1
<<
next_size
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_data_node
(
object
,
size
);
case
BPLIST_STRING
:
if
(
BPLIST_FILL
==
size
)
{
uint8_t
next_size
=
**
object
&
BPLIST_FILL
;
if
((
**
object
&
BPLIST_MASK
)
!=
BPLIST_UINT
)
return
NULL
;
(
*
object
)
++
;
size
=
UINT_TO_HOST
(
*
object
,
(
1
<<
next_size
));
(
*
object
)
+=
(
1
<<
next_size
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_string_node
(
object
,
size
);
case
BPLIST_UNICODE
:
if
(
BPLIST_FILL
==
size
)
{
uint8_t
next_size
=
**
object
&
BPLIST_FILL
;
if
((
**
object
&
BPLIST_MASK
)
!=
BPLIST_UINT
)
return
NULL
;
(
*
object
)
++
;
size
=
UINT_TO_HOST
(
*
object
,
(
1
<<
next_size
));
(
*
object
)
+=
(
1
<<
next_size
);
}
if
(
*
object
-
bplist
->
data
+
size
*
2
>=
bplist
->
size
)
return
NULL
;
return
parse_unicode_node
(
object
,
size
);
case
BPLIST_SET
:
case
BPLIST_ARRAY
:
if
(
BPLIST_FILL
==
size
)
{
uint8_t
next_size
=
**
object
&
BPLIST_FILL
;
if
((
**
object
&
BPLIST_MASK
)
!=
BPLIST_UINT
)
return
NULL
;
(
*
object
)
++
;
size
=
UINT_TO_HOST
(
*
object
,
(
1
<<
next_size
));
(
*
object
)
+=
(
1
<<
next_size
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_array_node
(
bplist
,
object
,
size
);
...
...
@@ -624,18 +611,10 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
return
parse_uid_node
(
object
,
size
);
case
BPLIST_DICT
:
if
(
BPLIST_FILL
==
size
)
{
uint8_t
next_size
=
**
object
&
BPLIST_FILL
;
if
((
**
object
&
BPLIST_MASK
)
!=
BPLIST_UINT
)
return
NULL
;
(
*
object
)
++
;
size
=
UINT_TO_HOST
(
*
object
,
(
1
<<
next_size
));
(
*
object
)
+=
(
1
<<
next_size
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_dict_node
(
bplist
,
object
,
size
);
default:
return
NULL
;
}
...
...
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