From 07e92dd116ed08ec8fc12cae6e48d7f2146aec53 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Tue, 7 Feb 2017 12:49:58 +0100 Subject: bplist: Make sure to bail out if malloc() fails in parse_unicode_node() Credit to OSS-Fuzz --- src/bplist.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bplist.c b/src/bplist.c index c1f6007..640a5c0 100644 --- a/src/bplist.c +++ b/src/bplist.c @@ -368,6 +368,11 @@ static plist_t parse_unicode_node(const char **bnode, uint64_t size) data->type = PLIST_STRING; unicodestr = (uint16_t*) malloc(sizeof(uint16_t) * size); + if (!unicodestr) { + plist_free_data(data); + PLIST_BIN_ERR("%s: Could not allocate %" PRIu64 " bytes\n", __func__, sizeof(uint16_t) * size); + return NULL; + } for (i = 0; i < size; i++) unicodestr[i] = be16toh(((uint16_t*)*bnode)[i]); -- cgit v1.1-32-gdbae