From 3f0bc6eecbef10d63fc54a3282c3b61823fd008f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Dec 2014 23:36:06 +0100
Subject: [PATCH] Ignore extra bytes after the SCVR string list (Fixes #2184)

---
 components/esm/loadscpt.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 19e3f3bb3..07561c2ea 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -30,7 +30,14 @@ void Script::load(ESMReader &esm)
         int s = mData.mStringTableSize;
 
         std::vector<char> tmp (s);
-        esm.getHExact (&tmp[0], s);
+        // not using getHExact, vanilla doesn't seem to mind unused bytes at the end
+        esm.getSubHeader();
+        int left = esm.getSubSize();
+        if (left < s)
+            esm.fail("SCVR string list is smaller than specified");
+        esm.getExact(&tmp[0], s);
+        if (left > s)
+            esm.skip(left-s); // skip the leftover junk
 
         // Set up the list of variable names
         mVarNames.resize(mData.mNumShorts + mData.mNumLongs + mData.mNumFloats);