fix possible infinite loop when transcoding from/to UTF-8

FreeCAD · Feb 14, 2019 · 1a68b75 · 1a68b75
1 parent ad51185
commit 1a68b75
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Base/XMLTools.h b/src/Base/XMLTools.h
@@ -157,6 +157,10 @@ inline StrXUTF8::StrXUTF8(const XMLCh* const toTranscode)
         str.append((const char*)outBuff, outputLength);
         offset += eaten;
         inputLength -= eaten;
+
+        //  Bail out if nothing more was produced
+        if (outputLength == 0)
+            break;
     }
 }
 
@@ -274,6 +278,10 @@ inline XUTF8Str::XUTF8Str(const char* const fromTranscode)
         str.append(outBuff, outputLength);
         offset += eaten;
         inputLength -= eaten;
+
+        //  Bail out if nothing more was produced
+        if (outputLength == 0)
+            break;
     }
 
     delete[] charSizes;