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
67eb54ab
Commit
67eb54ab
authored
8 years ago
by
Nikias Bassen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bplist: Make sure node data is always before the offset table
parent
8e51cdc2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
bplist.c
src/bplist.c
+14
-14
No files found.
src/bplist.c
View file @
67eb54ab
...
@@ -374,7 +374,6 @@ static plist_t parse_dict_node(struct bplist_data *bplist, const char** bnode, u
...
@@ -374,7 +374,6 @@ static plist_t parse_dict_node(struct bplist_data *bplist, const char** bnode, u
uint64_t
str_i
=
0
,
str_j
=
0
;
uint64_t
str_i
=
0
,
str_j
=
0
;
uint64_t
index1
,
index2
;
uint64_t
index1
,
index2
;
plist_data_t
data
=
plist_new_plist_data
();
plist_data_t
data
=
plist_new_plist_data
();
const
char
*
const
end_data
=
bplist
->
data
+
bplist
->
size
;
const
char
*
index1_ptr
=
NULL
;
const
char
*
index1_ptr
=
NULL
;
const
char
*
index2_ptr
=
NULL
;
const
char
*
index2_ptr
=
NULL
;
...
@@ -389,8 +388,8 @@ static plist_t parse_dict_node(struct bplist_data *bplist, const char** bnode, u
...
@@ -389,8 +388,8 @@ static plist_t parse_dict_node(struct bplist_data *bplist, const char** bnode, u
index1_ptr
=
(
*
bnode
)
+
str_i
;
index1_ptr
=
(
*
bnode
)
+
str_i
;
index2_ptr
=
(
*
bnode
)
+
str_j
;
index2_ptr
=
(
*
bnode
)
+
str_j
;
if
((
index1_ptr
<
bplist
->
data
||
index1_ptr
+
bplist
->
ref_size
>
=
end_data
)
||
if
((
index1_ptr
<
bplist
->
data
||
index1_ptr
+
bplist
->
ref_size
>
bplist
->
offset_table
)
||
(
index2_ptr
<
bplist
->
data
||
index2_ptr
+
bplist
->
ref_size
>
=
end_data
))
{
(
index2_ptr
<
bplist
->
data
||
index2_ptr
+
bplist
->
ref_size
>
bplist
->
offset_table
))
{
plist_free
(
node
);
plist_free
(
node
);
return
NULL
;
return
NULL
;
}
}
...
@@ -450,7 +449,6 @@ static plist_t parse_array_node(struct bplist_data *bplist, const char** bnode,
...
@@ -450,7 +449,6 @@ static plist_t parse_array_node(struct bplist_data *bplist, const char** bnode,
uint64_t
str_j
=
0
;
uint64_t
str_j
=
0
;
uint64_t
index1
;
uint64_t
index1
;
plist_data_t
data
=
plist_new_plist_data
();
plist_data_t
data
=
plist_new_plist_data
();
const
char
*
const
end_data
=
bplist
->
data
+
bplist
->
size
;
const
char
*
index1_ptr
=
NULL
;
const
char
*
index1_ptr
=
NULL
;
data
->
type
=
PLIST_ARRAY
;
data
->
type
=
PLIST_ARRAY
;
...
@@ -462,7 +460,7 @@ static plist_t parse_array_node(struct bplist_data *bplist, const char** bnode,
...
@@ -462,7 +460,7 @@ static plist_t parse_array_node(struct bplist_data *bplist, const char** bnode,
str_j
=
j
*
bplist
->
ref_size
;
str_j
=
j
*
bplist
->
ref_size
;
index1_ptr
=
(
*
bnode
)
+
str_j
;
index1_ptr
=
(
*
bnode
)
+
str_j
;
if
(
index1_ptr
<
bplist
->
data
||
index1_ptr
+
bplist
->
ref_size
>
=
end_data
)
{
if
(
index1_ptr
<
bplist
->
data
||
index1_ptr
+
bplist
->
ref_size
>
bplist
->
offset_table
)
{
plist_free
(
node
);
plist_free
(
node
);
return
NULL
;
return
NULL
;
}
}
...
@@ -530,7 +528,7 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
...
@@ -530,7 +528,7 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
return
NULL
;
return
NULL
;
(
*
object
)
++
;
(
*
object
)
++
;
next_size
=
1
<<
next_size
;
next_size
=
1
<<
next_size
;
if
(
*
object
+
next_size
>
=
bplist
->
data
+
bplist
->
siz
e
)
if
(
*
object
+
next_size
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
size
=
UINT_TO_HOST
(
*
object
,
next_size
);
size
=
UINT_TO_HOST
(
*
object
,
next_size
);
(
*
object
)
+=
next_size
;
(
*
object
)
+=
next_size
;
...
@@ -572,48 +570,50 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
...
@@ -572,48 +570,50 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
}
}
case
BPLIST_UINT
:
case
BPLIST_UINT
:
if
(
*
object
-
bplist
->
data
+
(
uint64_t
)(
1
<<
size
)
>=
bplist
->
siz
e
)
if
(
*
object
+
(
uint64_t
)(
1
<<
size
)
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_uint_node
(
object
,
size
);
return
parse_uint_node
(
object
,
size
);
case
BPLIST_REAL
:
case
BPLIST_REAL
:
if
(
*
object
-
bplist
->
data
+
(
uint64_t
)(
1
<<
size
)
>=
bplist
->
siz
e
)
if
(
*
object
+
(
uint64_t
)(
1
<<
size
)
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_real_node
(
object
,
size
);
return
parse_real_node
(
object
,
size
);
case
BPLIST_DATE
:
case
BPLIST_DATE
:
if
(
3
!=
size
)
if
(
3
!=
size
)
return
NULL
;
return
NULL
;
if
(
*
object
-
bplist
->
data
+
(
uint64_t
)(
1
<<
size
)
>=
bplist
->
siz
e
)
if
(
*
object
+
(
uint64_t
)(
1
<<
size
)
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_date_node
(
object
,
size
);
return
parse_date_node
(
object
,
size
);
case
BPLIST_DATA
:
case
BPLIST_DATA
:
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
siz
e
)
if
(
*
object
+
size
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_data_node
(
object
,
size
);
return
parse_data_node
(
object
,
size
);
case
BPLIST_STRING
:
case
BPLIST_STRING
:
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
siz
e
)
if
(
*
object
+
size
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_string_node
(
object
,
size
);
return
parse_string_node
(
object
,
size
);
case
BPLIST_UNICODE
:
case
BPLIST_UNICODE
:
if
(
*
object
-
bplist
->
data
+
size
*
2
>=
bplist
->
siz
e
)
if
(
*
object
+
size
*
2
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_unicode_node
(
object
,
size
);
return
parse_unicode_node
(
object
,
size
);
case
BPLIST_SET
:
case
BPLIST_SET
:
case
BPLIST_ARRAY
:
case
BPLIST_ARRAY
:
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
siz
e
)
if
(
*
object
+
size
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_array_node
(
bplist
,
object
,
size
);
return
parse_array_node
(
bplist
,
object
,
size
);
case
BPLIST_UID
:
case
BPLIST_UID
:
if
(
*
object
+
size
+
1
>
bplist
->
offset_table
)
return
NULL
;
return
parse_uid_node
(
object
,
size
);
return
parse_uid_node
(
object
,
size
);
case
BPLIST_DICT
:
case
BPLIST_DICT
:
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
siz
e
)
if
(
*
object
+
size
>
bplist
->
offset_tabl
e
)
return
NULL
;
return
NULL
;
return
parse_dict_node
(
bplist
,
object
,
size
);
return
parse_dict_node
(
bplist
,
object
,
size
);
...
...
This diff is collapsed.
Click to expand it.
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