Fix #693

lief-project · Apr 2, 2022 · 3155174 · 3155174
1 parent c2dc898
commit 3155174
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/PE/ResourcesParser.cpp b/src/PE/ResourcesParser.cpp
@@ -472,17 +472,22 @@ ok_error_t ResourcesParser::parse_string(LangCodeItem& lci, BinaryStream& stream
       /*
        * Read the value
        */
-      LIEF_DEBUG("String.Value @0x{:x}", stream.pos());
-      if (auto res = stream.read_u16string()) {
-        if (res->size() + /* null char */ 1 != wValueLength) {
-          LIEF_INFO("String.Value.size() is different from wValueLength ({} / {})",
-                    wValueLength, res->size() + 1);
+      if (wValueLength > 0) {
+        LIEF_DEBUG("String.Value @0x{:x}", stream.pos());
+        if (auto res = stream.read_u16string()) {
+          if (res->size() + /* null char */ 1 != wValueLength) {
+            LIEF_INFO("String.Value.size() is different from wValueLength ({} / {})",
+                      wValueLength, res->size() + 1);
+          }
+          value = res->c_str(); // To remove trailling \0
+          std::string u8value = u16tou8(value);
+          LIEF_DEBUG("{}: {}", u8szKey, u8value);
+          lci.items_.emplace(szKey, value);
+          stream.align(sizeof(uint32_t));
         }
-        value = res->c_str(); // To remove trailling \0
-        std::string u8value = u16tou8(value);
-        LIEF_DEBUG("{}: {}", u8szKey, u8value);
-        lci.items_.emplace(szKey, value);
-        stream.align(sizeof(uint32_t));
+      } else {
+
+        lci.items_.emplace(szKey, std::u16string());
       }
     } else {
       LIEF_ERR("Can't read String.szKey");