2
0
Эх сурвалжийг харах

Merge pull request #496 from JeffProgrammer/getWords_buffer_fix

Fix buffer overflow issue in StringUnit::getWords
Brian Roberts 4 жил өмнө
parent
commit
802598766a

+ 3 - 3
Engine/source/core/strings/stringUnit.cpp

@@ -42,7 +42,7 @@ namespace StringUnit
          
       buffer[0] = 0;
       
-      U32 sz;
+      dsize_t sz;
       while(index--)
       {
          if(!*string)
@@ -71,7 +71,7 @@ namespace StringUnit
       if( startIndex > endIndex )
          return "";
 
-      S32 sz;
+      dsize_t sz;
       S32 index = startIndex;
       while(index--)
       {
@@ -89,7 +89,7 @@ namespace StringUnit
          sz = dStrcspn(string, set);
          string += sz;
 
-         if( i < endIndex )
+         if( i < endIndex && *string )
             string ++;
       }