0023909: FPE in BSplSLib::RationalDerivative

Avoid use of array out of its bounds in BSplSLib::RationalDerivative().

In addition, Resource_Manager is fixed to allow saving with empty resource map (test bugs fclasses bug181_1).

diff --git a/src/BSplSLib/BSplSLib.cxx b/src/BSplSLib/BSplSLib.cxx
index 49cfa7684f670ba54c69f7ea5e7c20c2d84fe55f..95b1bb216c2cccb53a02a1fe1b86d41fd6fd94c4 100755 (executable)
--- a/src/BSplSLib/BSplSLib.cxx
+++ b/src/BSplSLib/BSplSLib.cxx
@@ -165,17 +165,17 @@ void  BSplSLib::RationalDerivative(const Standard_Integer UDeg,
     index_w  = iiM1;
     
     for (jj = 0 ; jj < MinM1 ; jj++) {
-      RArray[index_v] = HomogeneousArray[index_v1]; index_v++; index_v1++;
-      RArray[index_v] = HomogeneousArray[index_v1]; index_v++; index_v1++;
-      RArray[index_v] = HomogeneousArray[index_v1]; index_v++; index_v1++;
-      StoreW[index_w] = HomogeneousArray[index_v1]; index_w++; index_v1++;
+      RArray[index_v++] = HomogeneousArray[index_v1++];
+      RArray[index_v++] = HomogeneousArray[index_v1++];
+      RArray[index_v++] = HomogeneousArray[index_v1++];
+      StoreW[index_w++] = HomogeneousArray[index_v1++];
     }
 
     for (jj = MinM1 ; jj < M1 ; jj++) {
-      RArray[index_v] = 0.0e0                     ; index_v++; index_v1++;
-      RArray[index_v] = 0.0e0                     ; index_v++; index_v1++;
-      RArray[index_v] = 0.0e0                     ; index_v++; index_v1++;
-      StoreW[index_w] = HomogeneousArray[index_v1]; index_w++; index_v1++;
+      RArray[index_v++] = 0.;
+      RArray[index_v++] = 0.;
+      RArray[index_v++] = 0.;
+      StoreW[index_w++] = 0.;
     }
     index_u1 += M4;
     index_u  += M3;
@@ -186,10 +186,10 @@ void  BSplSLib::RationalDerivative(const Standard_Integer UDeg,
   for (ii = MinN1 ; ii < N1 ; ii++) {
     
     for (jj = 0 ; jj < M1 ; jj++) {  
-      RArray[index_v] = 0.0e0; index_v++;
-      RArray[index_v] = 0.0e0; index_v++;
-      RArray[index_v] = 0.0e0; index_v++;
-      StoreW[index_w] = 0.0e0; index_w++;
+      RArray[index_v++] = 0.0e0;
+      RArray[index_v++] = 0.0e0;
+      RArray[index_v++] = 0.0e0;
+      StoreW[index_w++] = 0.0e0;
     }
   } 
 

diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx
index 861c5517d1a2c162c4fca1839fd489a1e56c45ca..5b1695316ddf7c0c5897f9d94bc0f9ff358d316c 100755 (executable)
--- a/src/Resource/Resource_Manager.cxx
+++ b/src/Resource/Resource_Manager.cxx
@@ -294,7 +294,7 @@ Standard_Boolean Resource_Manager::Save() const
 
   Resource_LexicalCompare Comp;
   Standard_Integer NbKey = myUserMap.Extent();
-  TColStd_Array1OfAsciiString KeyArray(1,NbKey);
+  TColStd_Array1OfAsciiString KeyArray(1,NbKey+1); // 1 more item is added to allow saving empty resource
   Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString Iter(myUserMap);
 
   for ( Index = 1; Iter.More(); Iter.Next())