0027522: Foundation Classes, FSD_BinaryFile - incorrect size check in a stream

FSD_BinaryFile::ReadExtendedString() now compares read bytes, not symbols.

diff --git a/src/FSD/FSD_BinaryFile.cxx b/src/FSD/FSD_BinaryFile.cxx
index 0a40d2d2c7047c5c1187765d3415072b031f3759..3f344161e245f210ddf9cad39c218102087a3341 100644 (file)
--- a/src/FSD/FSD_BinaryFile.cxx
+++ b/src/FSD/FSD_BinaryFile.cxx
@@ -1639,13 +1639,13 @@ void FSD_BinaryFile::ReadExtendedString (Standard_IStream& theIStream, TCollecti
       Storage_StreamReadError::Raise();
     }
 
-    theIStream.read ((char *)c, size*sizeof(Standard_ExtCharacter));
-
-    if (theIStream.gcount() != size)
+    const std::streamsize aNbBytes = std::streamsize(sizeof(Standard_ExtCharacter) * size);
+    theIStream.read ((char *)c, aNbBytes);
+    if (theIStream.gcount() != aNbBytes)
     {
       Storage_StreamReadError::Raise();
     }
-          
+
     c[size] = '\0';
 
 #if OCCT_BINARY_FILE_DO_INVERSE