Merged pull request OpenMW#1965

rshageev · Oct 13, 2018 · 6024143 · 6024143
2 parents b30e309 + ca8744a
commit 6024143
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -140,6 +140,7 @@
     Bug #4672: Pitch factor is handled incorrectly for crossbow animations
     Bug #4674: Journal can be opened when settings window is open
     Bug #4677: Crash in ESM reader when NPC record has DNAM record without DODT one
+    Bug #4678: Crash in ESP parser when SCVR has no variable names
     Feature #912: Editor: Add missing icons to UniversalId tables
     Feature #1221: Editor: Creature/NPC rendering
     Feature #1617: Editor: Enchantment effect record verifier

diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
@@ -30,6 +30,12 @@ namespace ESM
         // The tmp buffer is a null-byte separated string list, we
         // just have to pick out one string at a time.
         char* str = &tmp[0];
+        if (!str && mVarNames.size() > 0)
+        {
+            Log(Debug::Warning) << "SCVR with no variable names";
+            return;
+        }
+
         for (size_t i = 0; i < mVarNames.size(); i++)
         {
             // Support '\r' terminated strings like vanilla.  See Bug #1324.