From: taeyoon0.lee Date: Tue, 16 May 2017 08:12:48 +0000 (+0900) Subject: Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" X-Git-Tag: accepted/tizen/unified/20170518.061130~11 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a6bfb5a20c362b143e05c81dc662a4ecd717f179 Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" This reverts commit bdc5c524a6a96ad36194c4e6b58c20ce85237339. Change-Id: I00d666974bd97e35bcd083e2c9ba557950ca69e3 --- diff --git a/dali-toolkit/third-party/nanosvg/nanosvg.cc b/dali-toolkit/third-party/nanosvg/nanosvg.cc index 601413c..d3ffc40 100644 --- a/dali-toolkit/third-party/nanosvg/nanosvg.cc +++ b/dali-toolkit/third-party/nanosvg/nanosvg.cc @@ -1038,15 +1038,9 @@ 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' and use strtol here + * To prevent the possible overflow, we replace '%s' with '%32s' here. */ - 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); - + sscanf(str + 4, "%d%32[%%, \t]%d%32[%%, \t]%d", &r, s1, &g, s2, &b); if (strchr(s1, '%')) { return NSVG_RGB((r*255)/100,(g*255)/100,(b*255)/100); } else { @@ -1275,9 +1269,9 @@ static NSVGcoordinate nsvg__parseCoordinateRaw(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 '%32s' here. */ - sscanf(str, "%f%31s", &coord.value, units); + sscanf(str, "%f%32s", &coord.value, units); coord.units = nsvg__parseUnits(units); return coord; }