[cgma-dev] r2161 - cgm/trunk/geom/OCC

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-10-20 15:30:33 -0500 (Mon, 20 Oct 2008)
New Revision: 2161

Modified:
   cgm/trunk/geom/OCC/OCCAttribSet.cpp
Log:
fix read off end of array (non-null-terminated strings pased to CubitString consturctor and nonportable code (GNU variable-length arrays.)

Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCAttribSet.cpp	2008-10-20 20:22:33 UTC (rev 2160)
+++ cgm/trunk/geom/OCC/OCCAttribSet.cpp	2008-10-20 20:30:33 UTC (rev 2161)
@@ -28,6 +28,7 @@
 #include "TDataStd_Shape.hxx"
 #include "TopoDS_Shape.hxx"
 #include "TDF_ChildIterator.hxx"
+#include <vector>
 
 void OCCAttribSet::FindShape(TopoDS_Shape& shape,
                              TDF_Label& aLabel,
@@ -330,15 +331,14 @@
   {
     name_string = attr_name->Get();
     int length = name_string.Length();
-    char temp_type[length];
+    std::vector<char> temp_type(length+1);
     for (int i = 1 ;  i <= length; i++)
     {
       Standard_ExtCharacter c = name_string.Value(i);
       temp_type[i-1] = ToCharacter(c);
     }
-    CubitString temp_string(temp_type);
-    temp_string = temp_string.substr(0, length);
-    string = new CubitString(temp_string);
+    temp_type[length] = '\0';
+    string = new CubitString(&temp_type[0]);
     strings.append(string);
   }
   if(lab.FindAttribute(TDataStd_ExtStringArray::GetID(), attr_string))
@@ -348,15 +348,14 @@
     {
       name_string = attr_string->Value(i);
       int length2 = name_string.Length();
-      char temp_string[length2];
+      std::vector<char> temp_string(length2+1);
       for(int j = 1; j <= length2; j ++)
       {
         Standard_ExtCharacter c = name_string.Value(j);
         temp_string[j-1] = ToCharacter(c);
       }
-      CubitString tmp_string(temp_string);
-      tmp_string = tmp_string.substr(0, length2);
-      string = new CubitString(tmp_string);
+      temp_string[length2] = '\0';
+      string = new CubitString(&temp_string[0]);
       strings.append(string);
     }
   }