0030101: Application Framework - A mistake reading a RealArray attribute with too...

A case of reading of a very small value was skipped, for example: 2.1219957909652723e-314.
Fixed in XmlMDataStd_RealArrayDriver.cxx and XmlMDataStd_RealListDriver.cxx

// A test file bug29452.xml is extended to check this skipped case.

diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
index 04fc0c949dd9736dc74403c34280712f47f3c9cb..ddc296ad5d5deb3f39399c1601fb0d2bd5a1bc46 100644 (file)
--- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
@@ -128,8 +128,12 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste
                                      " for RealArray attribute as \"")
             + aValueStr + "\"";
         myMessageDriver->Send (aMessageString, Message_Warning);
+        // skip the first space, if exists
+        while (*aValueStr != 0 && IsSpace (*aValueStr))
+          ++aValueStr;
         // skip to the next space separator
-        while (*aValueStr != 0 && ! IsSpace (*aValueStr)) ++aValueStr;
+        while (*aValueStr != 0 && ! IsSpace (*aValueStr))
+          ++aValueStr;
       }
       aRealArray->SetValue(ind, aValue);
     }

diff --git a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
index 844f92692fba5019fe517bca868d5511148bea85..b0eb2a1f6b3cbd537fa8c31fd3c1dfaa14392934 100644 (file)
--- a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
@@ -126,8 +126,12 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
                                      " for RealList attribute as \"")
             + aValueStr + "\"";
         myMessageDriver->Send(aMessageString, Message_Warning);
+        // skip the first space, if exists
+        while (*aValueStr != 0 && IsSpace (*aValueStr))
+          ++aValueStr;
         // skip to the next space separator
-        while (*aValueStr != 0 && ! IsSpace (*aValueStr)) ++aValueStr;
+        while (*aValueStr != 0 && !IsSpace (*aValueStr))
+          ++aValueStr;
       }
       aRealList->Append(aValue);
     }

diff --git a/tests/bugs/caf/bug29452 b/tests/bugs/caf/bug29452
index fc4d6a51a44fe131be44b865ff8e512987738062..df575e51398f779b7456df346f753be7dea6c1a5 100644 (file)
--- a/tests/bugs/caf/bug29452
+++ b/tests/bugs/caf/bug29452
@@ -18,6 +18,7 @@ set res [Open $file D]
 set real [GetReal D 0:1]
 set rlst [GetRealList D 0:1]
 set rarr [GetRealArray D 0:1]
+set rarr2 [GetRealArray D 0:2]
 
 # Check for read values
 checkreal "Real value" [lindex $rlst 0] 1.1 0 1e-15
@@ -25,6 +26,9 @@ checkreal "Real value" [lindex $rlst 2] 3.3 0 1e-15
 checkreal "Real value" [lindex $rarr 0] 0.111 0 1e-15
 checkreal "Real value" [lindex $rarr 3] 123. 0 1e-15
 checkreal "Real value" [lindex $rarr 4] 3.14e12 0 1e-15
+checkreal "Real value" [lindex $rarr2 0] 2 0 1e-15
+checkreal "Real value" [lindex $rarr2 1] 2.1219957909652723e-314 0 1e-15
+checkreal "Real value" [lindex $rarr2 2] 5 0 1e-15
 foreach inf [list $real [lindex $rlst 3]] {
   if { [string compare "$inf" "inf"] && 
        [string compare "$inf" "infinity"] &&