From d25e919f29078127b0305f88cdcbc33a798c5d90 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Wed, 6 Apr 2022 01:04:50 +0200 Subject: Skip whitespace to properly detect format in plist_from_memory() --- src/plist.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plist.c b/src/plist.c index 9f3c8f4..78e71da 100644 --- a/src/plist.c +++ b/src/plist.c @@ -199,10 +199,15 @@ PLIST_API plist_err_t plist_from_memory(const char *plist_data, uint32_t length, } if (plist_is_binary(plist_data, length)) { res = plist_from_bin(plist_data, length, plist); - } else if (plist_data[0] == '[' || plist_data[0] == '{') { - res = plist_from_json(plist_data, length, plist); } else { - res = plist_from_xml(plist_data, length, plist); + /* skip whitespace before checking */ + uint32_t pos = 0; + while (pos < length && ((plist_data[pos] == ' ') || (plist_data[pos] == '\t') || (plist_data[pos] == '\r') || (plist_data[pos] == '\n'))) pos++; + if (plist_data[pos] == '[' || plist_data[pos] == '{') { + res = plist_from_json(plist_data, length, plist); + } else { + res = plist_from_xml(plist_data, length, plist); + } } return res; } -- cgit v1.1-32-gdbae