X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbase%2FFBase_LocalizedNumParser.cpp;h=34b43b2582ec1c44264a103c5976072ef0e8bcf5;hb=7342d320a5590d0b88faa0daf5397de099c040a7;hp=bdcf7ecc7aa5b636b74a6c64256b4f57dc99d85b;hpb=b34ea5f0577dd444b1267fcf33438cf7baf95537;p=platform%2Fframework%2Fnative%2Fappfw.git

diff --git a/src/base/FBase_LocalizedNumParser.cpp b/src/base/FBase_LocalizedNumParser.cpp
index bdcf7ec..34b43b2 100644
--- a/src/base/FBase_LocalizedNumParser.cpp
+++ b/src/base/FBase_LocalizedNumParser.cpp
@@ -76,7 +76,7 @@ _LocalizedNumParser::ToDouble(const String& str, const char* pLocale)
 	double ret = wcstod(str.GetPointer(), &pEnd);
 	SysTryReturn(NID_BASE, !(ret == 0 && errno == EINVAL) && (pEnd[0] == 0), std::numeric_limits< double >::quiet_NaN(),
 		E_NUM_FORMAT, "[%s] wcstod() failed. Scan stopped at (%ls)", GetErrorMessage(E_NUM_FORMAT), pEnd);
-	SysTryReturn(NID_BASE, errno == 0 && ret != HUGE_VAL && ret != -HUGE_VAL, std::numeric_limits< double >::quiet_NaN(),
+	SysTryReturn(NID_BASE, errno == 0 || (ret != HUGE_VAL && ret != -HUGE_VAL), std::numeric_limits< double >::quiet_NaN(),
 		E_NUM_FORMAT, "[%s] Parsed value cannot fit into a Double.", GetErrorMessage(E_NUM_FORMAT));
 
 	return ret;
@@ -97,7 +97,7 @@ _LocalizedNumParser::ToFloat(const String& str, const char* pLocale)
 	float ret = wcstof(str.GetPointer(), &pEnd);
 	SysTryReturn(NID_BASE, !(ret == 0 && errno == EINVAL) && pEnd[0] == 0, std::numeric_limits< float >::quiet_NaN(),
 		E_NUM_FORMAT, "[%s] wcstof() failed. Scan stopped at (%ls).", GetErrorMessage(E_NUM_FORMAT), pEnd);
-	SysTryReturn(NID_BASE, errno == 0 && ret != HUGE_VAL && ret != -HUGE_VAL, std::numeric_limits< float >::quiet_NaN(),
+	SysTryReturn(NID_BASE, errno == 0 || (ret != HUGE_VAL && ret != -HUGE_VAL), std::numeric_limits< float >::quiet_NaN(),
 		E_NUM_FORMAT, "[%s] Parsed value cannot fit into a Float.", GetErrorMessage(E_NUM_FORMAT));
 
 	return ret;