Fixed|String|libcore: Use of uninitialized value

skyjake · Sep 1, 2019 · 01b8a97 · 01b8a97
1 parent 01fdc6e
commit 01b8a97
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/doomsday/libs/core/src/data/string.cpp b/doomsday/libs/core/src/data/string.cpp
@@ -1171,7 +1171,11 @@ Char mb_iterator::operator*() const
 
 Char mb_iterator::decode(const char **end) const
 {
-    if (*cur == 0) return {};
+    if (*cur == 0)
+    {
+        if (end) *end = cur;
+        return {};
+    }
 
     uint32_t ch = 0;
     int      rc = decodeBytes_MultibyteChar(cur, strnlen(cur, 8), &ch);
@@ -1202,6 +1206,7 @@ mb_iterator &mb_iterator::operator++()
     {
         ++cur;
     }
+    DE_ASSERT(cur >= start && cur <= start + strlen(start));
     return *this;
 }