From 35bf98a940aeb95fee28529869388a409c5a8611 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 19 Nov 2013 13:46:24 +0100
Subject: [PATCH] modified esm reader/writer to use UTF8 when no encoder is
 given

---
 components/esm/esmreader.cpp | 5 ++++-
 components/esm/esmwriter.cpp | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 51d86a2ee..f02ed2d6e 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -303,7 +303,10 @@ std::string ESMReader::getString(int size)
     getExact(ptr, size);
 
     // Convert to UTF8 and return
-    return mEncoder->getUtf8(ptr, size);
+    if (mEncoder)
+        return mEncoder->getUtf8(ptr, size);
+
+    return std::string (ptr, size);
 }
 
 void ESMReader::fail(const std::string &msg)
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index f39aa2b89..c9ef61b63 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -6,7 +6,7 @@
 
 namespace ESM
 {
-    ESMWriter::ESMWriter() : mRecordCount (0), mCounting (true) {}
+    ESMWriter::ESMWriter() : mEncoder (0), mRecordCount (0), mCounting (true) {}
 
     unsigned int ESMWriter::getVersion() const
     {
@@ -152,9 +152,9 @@ namespace ESM
         else
         {
             // Convert to UTF8 and return
-            std::string ascii = mEncoder->getLegacyEnc(data);
+            std::string string = mEncoder ? mEncoder->getLegacyEnc(data) : data;
 
-            write(ascii.c_str(), ascii.size());
+            write(string.c_str(), string.size());
         }
     }