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
b86a392b
Commit
b86a392b
authored
Nov 10, 2016
by
Filippo Bigarella
Committed by
Nikias Bassen
Nov 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bplist: Fix possible out-of-bounds reads in parse_bin_node() with proper bounds checking
parent
a4563ffe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
0 deletions
+21
-0
bplist.c
src/bplist.c
+21
-0
No files found.
src/bplist.c
View file @
b86a392b
...
...
@@ -568,15 +568,21 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
}
case
BPLIST_UINT
:
if
(
*
object
-
bplist
->
data
+
(
uint64_t
)(
1
<<
size
)
>=
bplist
->
size
)
return
NULL
;
return
parse_uint_node
(
object
,
size
);
case
BPLIST_REAL
:
if
(
*
object
-
bplist
->
data
+
(
uint64_t
)(
1
<<
size
)
>=
bplist
->
size
)
return
NULL
;
return
parse_real_node
(
object
,
size
);
case
BPLIST_DATE
:
if
(
3
!=
size
)
return
NULL
;
else
if
(
*
object
-
bplist
->
data
+
(
uint64_t
)(
1
<<
size
)
>=
bplist
->
size
)
return
NULL
;
return
parse_date_node
(
object
,
size
);
case
BPLIST_DATA
:
...
...
@@ -587,6 +593,9 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
plist_get_uint_val
(
size_node
,
&
size
);
plist_free
(
size_node
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_data_node
(
object
,
size
);
case
BPLIST_STRING
:
...
...
@@ -597,6 +606,9 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
plist_get_uint_val
(
size_node
,
&
size
);
plist_free
(
size_node
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_string_node
(
object
,
size
);
case
BPLIST_UNICODE
:
...
...
@@ -607,6 +619,9 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
plist_get_uint_val
(
size_node
,
&
size
);
plist_free
(
size_node
);
}
if
(
*
object
-
bplist
->
data
+
size
*
2
>=
bplist
->
size
)
return
NULL
;
return
parse_unicode_node
(
object
,
size
);
case
BPLIST_SET
:
...
...
@@ -618,6 +633,9 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
plist_get_uint_val
(
size_node
,
&
size
);
plist_free
(
size_node
);
}
if
(
*
object
-
bplist
->
data
+
size
>=
bplist
->
size
)
return
NULL
;
return
parse_array_node
(
bplist
,
object
,
size
);
case
BPLIST_UID
:
...
...
@@ -631,6 +649,9 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
plist_get_uint_val
(
size_node
,
&
size
);
plist_free
(
size_node
);
}
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