0029452: Application Framework - Failed to read an Ocaf XML document with 1.#QNAN...

[occt.git] / src / XmlObjMgt / XmlObjMgt.cxx

diff --git a/src/XmlObjMgt/XmlObjMgt.cxx b/src/XmlObjMgt/XmlObjMgt.cxx
index 5544f22..dcb55ef 100644 (file)
--- a/src/XmlObjMgt/XmlObjMgt.cxx
+++ b/src/XmlObjMgt/XmlObjMgt.cxx
@@ -23,6 +23,8 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <limits>
+
 static const char aRefPrefix [] = "/document/label";
 static const char aRefElem1  [] = "/label[@tag=";
 static const char aRefElem2  [] = "]";
@@ -344,11 +346,37 @@ Standard_Boolean XmlObjMgt::GetReal (Standard_CString& theString,
 {
   char * ptr;
   errno = 0;
-  double aValue = Strtod (theString, &ptr);
+  theValue = Strtod (theString, &ptr);
   if (ptr == theString || errno == ERANGE || errno == EINVAL)
     return Standard_False;
-  theValue = Standard_Real (aValue);
+
   theString = ptr;
+
+  // detect NAN or infinite values written by old MSVC run-time as -1. with 
+  // suffix "#QNAN" or "#SNAN" or "#INF"
+  if (*ptr == '#')
+  {
+    if (! strncmp (ptr, "#QNAN", 5) || ! strncmp (ptr, "#SNAN", 5))
+    {
+      theString = ptr + 5;
+      theValue = std::numeric_limits<double>::quiet_NaN();
+      return Standard_True;
+    }
+    else if (! strncmp (ptr, "#INF", 4))
+    {
+      theString = ptr + 4;
+      theValue = (theValue < 0 ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
+      return Standard_True;
+    }
+    else 
+      return Standard_False;
+  }
+  else if (*ptr && ! IsSpace (*ptr))
+  {
+    // report failure if reading stopped not at the end of the string or space
+    return Standard_False;
+  }
+
   return Standard_True;
 }
 
@@ -371,13 +399,8 @@ Standard_Boolean XmlObjMgt::GetReal (const XmlObjMgt_DOMString& theString,
     }
   default:      // LDOM_Ascii*
     {
-      char       * ptr;
       const char * aString = theString.GetString();
-      errno = 0;
-      double aValue = Strtod (aString, &ptr);
-      if (ptr == aString || errno == ERANGE || errno == EINVAL)
-        return Standard_False;
-      theValue = Standard_Real (aValue);
+      return GetReal (aString, theValue);
     }
   }
   return Standard_True;