From 4056f08afa3849b7e9d892a49801c6ff8917c0aa Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 14 Oct 2018 14:45:05 +0200
Subject: [PATCH] Switching to VS2017 compiler has found a bug in pofile.c

---
 src/util/pofile.c  | 4 ++--
 tests/runtests.bat | 3 ++-
 vs2015-build.bat   | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/util/pofile.c b/src/util/pofile.c
index 8de04364d..e1126ba0e 100644
--- a/src/util/pofile.c
+++ b/src/util/pofile.c
@@ -77,7 +77,7 @@ int pofile_read(const char *filename, int (*callback)(const char *msgid, const c
         int err = sscanf(line, "%8s", token);
         if (err == 1) {
             char *text = NULL;
-            size_t size, len = strlen(token);
+            size_t size = 0, len = strlen(token);
 
             line = line + len + 1;
             if (len == 7 && memcmp(token, "msgctxt", 7) == 0) {
@@ -99,7 +99,7 @@ int pofile_read(const char *filename, int (*callback)(const char *msgid, const c
                     msgid[0] = 0;
                 }
             }
-            if (text) {
+            if (size > 0) {
                 line = read_multiline(F, line, text, size);
             }
         }
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 95ac17be4..88afc8d31 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -3,7 +3,8 @@ IF EXIST ..\build-vs10 SET BUILD=..\build-vs10\eressea\Debug
 IF EXIST ..\build-vs11 SET BUILD=..\build-vs11\eressea\Debug
 IF EXIST ..\build-vs12 SET BUILD=..\build-vs12\eressea\Debug
 IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\eressea\Debug
-REM IF EXIST ..\build-vs15 SET BUILD=..\build-vs15\eressea\Debug
+IF EXIST ..\build-vs15 SET BUILD=..\build-vs15\eressea\Debug
+
 SET SERVER=%BUILD%\eressea.exe
 %BUILD%\test_eressea.exe
 %SERVER% ..\scripts\run-tests.lua
diff --git a/vs2015-build.bat b/vs2015-build.bat
index 1ad2c8da2..8d5c276ed 100644
--- a/vs2015-build.bat
+++ b/vs2015-build.bat
@@ -1,5 +1,7 @@
 @ECHO OFF
-SET VSVERSION=14
+SET VSVERSION=15
+IF NOT "%1" == "" SET VSVERSION=%1%
+
 SET SRCDIR=%CD%
 CD ..
 SET ERESSEA=%CD%