From 1607acd010b5f9643382323123641aaeca8d1339 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 26 Apr 2017 19:18:47 +0900 Subject: [PATCH] Fix SVACE issue - change sscanf(%d) to strtol Change-Id: I3e6f4ba14415471deaf0211562a33348f217fd0c --- dali-toolkit/third-party/nanosvg/nanosvg.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/third-party/nanosvg/nanosvg.cc b/dali-toolkit/third-party/nanosvg/nanosvg.cc index 5ddad99..601413c 100644 --- a/dali-toolkit/third-party/nanosvg/nanosvg.cc +++ b/dali-toolkit/third-party/nanosvg/nanosvg.cc @@ -1038,9 +1038,15 @@ static unsigned int nsvg__parseColorRGB(const char* str) /** * In the original file, the formatted data reading did not specify the string with width limitation. - * To prevent the possible overflow, we replace '%s' with '%31s' here. + * To prevent the possible overflow, we replace '%s' with '%31s' and use strtol here */ - sscanf(str + 4, "%d%31[%%, \t]%d%31[%%, \t]%d", &r, s1, &g, s2, &b); + char* end; + r = strtol(str + 4, &end, 10); + sscanf(end, "%31[%%, \t]", s1); + g = strtol(end + strlen(s1), &end, 10); + sscanf(end, "%31[%%, \t]", s2); + b = strtol(end + strlen(s2), &end, 10); + if (strchr(s1, '%')) { return NSVG_RGB((r*255)/100,(g*255)/100,(b*255)/100); } else { -- 2.7.4