From 22b429f142e1130bc3db8e5b730ae559ba5635fb Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Wed, 7 Jun 2017 12:08:25 +0900 Subject: [PATCH] Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" This reverts commit 5d9359856307ea7c326ea1b41d0cb0717fa072f5. Change-Id: I269c8d569715bfe6631bb6ddf59ed257a02e54f1 --- dali-toolkit/devel-api/controls/control-devel.h | 0 dali-toolkit/third-party/nanosvg/nanosvg.cc | 14 ++++---------- 2 files changed, 4 insertions(+), 10 deletions(-) mode change 100755 => 100644 dali-toolkit/devel-api/controls/control-devel.h diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h old mode 100755 new mode 100644 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; } -- 2.7.4