From 8d7226c78963bec271330c2fef0532c346a7570c Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Mon, 12 Jul 2021 13:26:32 +0900 Subject: [PATCH] svg_loader SvgUtil: Move nullcheck to before use prevent invalid access --- src/loaders/svg/tvgSvgUtil.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/loaders/svg/tvgSvgUtil.cpp b/src/loaders/svg/tvgSvgUtil.cpp index fbdcb52..3db6098 100644 --- a/src/loaders/svg/tvgSvgUtil.cpp +++ b/src/loaders/svg/tvgSvgUtil.cpp @@ -261,8 +261,10 @@ on_error: string svgUtilURLDecode(const char *src) { + if (!src) return nullptr; + auto length = strlen(src); - if (!src || length == 0) return nullptr; + if (length == 0) return nullptr; string decoded; decoded.reserve(length); @@ -291,8 +293,10 @@ string svgUtilURLDecode(const char *src) string svgUtilBase64Decode(const char *src) { + if (!src) return nullptr; + auto length = strlen(src); - if (!src || length == 0) return nullptr; + if (length == 0) return nullptr; string decoded; decoded.reserve(3*(1+(length >> 2))); -- 2.7.4