Changeset 74170 in vbox for trunk/src/VBox/Runtime/common/rest

Timestamp:

Sep 10, 2018 7:26:17 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124942

Message:

IPRT/rest: Added testcase for RTCRestDouble, fixing issues found. bugref:9167

File:

• trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp

@@ -306 +306 @@
 
 
-/** Default destructor. */
+/** Default constructor. */
 RTCRestInt64::RTCRestInt64()
     : RTCRestObjectBase()
@@ -470 +470 @@
 
 
-/** Default destructor. */
+/** Default constructor. */
 RTCRestInt32::RTCRestInt32()
     : RTCRestObjectBase()
@@ -640 +640 @@
 
 
-/** Default destructor. */
+/** Default constructor. */
 RTCRestInt16::RTCRestInt16()
     : RTCRestObjectBase()
@@ -809 +809 @@
 }
 
-/** Default destructor. */
+/** Default constructor. */
 RTCRestDouble::RTCRestDouble()
     : RTCRestObjectBase()
@@ -881 +881 @@
         char szValue[128];
 #ifdef _MSC_VER
-        _snprintf(szValue, sizeof(szValue), "%g", m_rdValue);
+        _snprintf(szValue, sizeof(szValue), "%.18g", m_rdValue);
 #else
-        snprintf(szValue, sizeof(szValue), "%g", m_rdValue);
+        snprintf(szValue, sizeof(szValue), "%.18g", m_rdValue);
 #endif
+        size_t cchValue = strlen(szValue);
+        while (cchValue > 0 && szValue[-1] == '0')
+            cchValue--;
+        szValue[cchValue] = '\0';
+
         a_rDst.printf("%s", szValue);
     }
@@ -944 +949 @@
         char szValue[128];
 #ifdef _MSC_VER
-        _snprintf(szValue, sizeof(szValue), "%g", m_rdValue);
+        _snprintf(szValue, sizeof(szValue), "%.18g", m_rdValue);
 #else
-        snprintf(szValue, sizeof(szValue), "%g", m_rdValue);
+        snprintf(szValue, sizeof(szValue), "%.18g", m_rdValue);
 #endif
-        size_t const cchValue = strlen(szValue);
+        size_t cchValue = strlen(szValue);
+        while (cchValue > 0 && szValue[-1] == '0')
+            cchValue--;
+        szValue[cchValue] = '\0';
 
         if (!(a_fFlags & kToString_Append))
@@ -965 +973 @@
 {
     RT_NOREF(a_fFlags);
+
+    if (a_rValue.startsWithWord("null", RTCString::CaseInsensitive))
+    {
+        m_rdValue = 0.0;
+        m_fNullIndicator = true;
+        return VINF_SUCCESS;
+    }
 
     m_fNullIndicator = false;
@@ -972 +987 @@
     char *pszNext = NULL;
     m_rdValue = strtod(pszValue, &pszNext);
-    if (errno == 0)
-        return VINF_SUCCESS;
-
-    if (a_rValue.startsWithWord("null", RTCString::CaseInsensitive))
-    {
-        m_rdValue = 0.0;
-        m_fNullIndicator = true;
-        return VINF_SUCCESS;
-    }
-
+    if (errno == 0 && pszNext != pszValue)
+    {
+        if (!pszNext || *pszNext == '\0')
+            return VINF_SUCCESS;
+
+        while (RT_C_IS_SPACE(*pszNext))
+            pszNext++;
+        if (*pszNext == '\0')
+            return VINF_SUCCESS;
+
+        return RTErrInfoSetF(a_pErrInfo, VERR_TRAILING_CHARS, "%s: error VERR_TRAILING_CHARS parsing '%s' as double",
+                             a_pszName, a_rValue.c_str());
+    }
+
+    if (!RT_C_IS_DIGIT(*pszValue) && *pszValue != '.')
+        return RTErrInfoSetF(a_pErrInfo, VERR_NO_DIGITS, "%s: error VERR_NO_DIGITS parsing '%s' as double",
+                             a_pszName, a_rValue.c_str());
     int rc = RTErrConvertFromErrno(errno);
     return RTErrInfoSetF(a_pErrInfo, rc, "%s: error %Rrc parsing '%s' as double", a_pszName, rc, a_rValue.c_str());
@@ -1011 +1033 @@
 
 
-/** Default destructor. */
+/** Default constructor. */
 RTCRestString::RTCRestString()
     : RTCString()