From 5a6498af92292b2226bcbdc9e5d20cdd71819d20 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:14:38 +0100
Subject: [PATCH 1/5] Fix nullptr access

---
 code/Common/DefaultIOSystem.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index 2512e57c8..39f2405f6 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -60,19 +60,32 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 #ifdef _WIN32
+
+const std::wstring wdummy;
+
 static std::wstring Utf8ToWide(const char *in) {
+    if (nullptr == in) {
+        return wdummy;
+    }
     int size = MultiByteToWideChar(CP_UTF8, 0, in, -1, nullptr, 0);
     // size includes terminating null; std::wstring adds null automatically
     std::wstring out(static_cast<size_t>(size) - 1, L'\0');
     MultiByteToWideChar(CP_UTF8, 0, in, -1, &out[0], size);
+    
     return out;
 }
 
+const std::wstring dummy;
+
 static std::string WideToUtf8(const wchar_t *in) {
+    if (nullptr == in) {
+        return dummy;
+    }
     int size = WideCharToMultiByte(CP_UTF8, 0, in, -1, nullptr, 0, nullptr, nullptr);
     // size includes terminating null; std::string adds null automatically
     std::string out(static_cast<size_t>(size) - 1, '\0');
     WideCharToMultiByte(CP_UTF8, 0, in, -1, &out[0], size, nullptr, nullptr);
+    
     return out;
 }
 #endif
@@ -104,7 +117,12 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
     ai_assert(strMode != nullptr);
     FILE *file;
 #ifdef _WIN32
-    file = ::_wfopen(Utf8ToWide(strFile).c_str(), Utf8ToWide(strMode).c_str());
+    std::string name = Utf8ToWide(strFile).c_str();
+    if (name.empty()) {
+        return nullptr;
+    }
+    
+    file = ::_wfopen(, Utf8ToWide(strMode).c_str());
 #else
     file = ::fopen(strFile, strMode);
 #endif

From 5b325af79f7813631fce81f2173e3e9c69fa7618 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:19:42 +0100
Subject: [PATCH 2/5] Fix typo.

---
 code/Common/DefaultIOSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index 39f2405f6..c3059ac31 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -75,7 +75,7 @@ static std::wstring Utf8ToWide(const char *in) {
     return out;
 }
 
-const std::wstring dummy;
+const std::string dummy;
 
 static std::string WideToUtf8(const wchar_t *in) {
     if (nullptr == in) {

From f05a57560baa19f8ff49e9d9ddcf5fd1cc693d11 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:27:50 +0100
Subject: [PATCH 3/5] Remove buggy method.

---
 code/Common/DefaultIOSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index c3059ac31..82029f0c9 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -117,7 +117,7 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
     ai_assert(strMode != nullptr);
     FILE *file;
 #ifdef _WIN32
-    std::string name = Utf8ToWide(strFile).c_str();
+    std::string name = Utf8ToWide(strFile);
     if (name.empty()) {
         return nullptr;
     }

From ed3e7457529cd29ed8c4c6bb5b56d37349d5a371 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:58:04 +0100
Subject: [PATCH 4/5] Update DefaultIOSystem.cpp

---
 code/Common/DefaultIOSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index 82029f0c9..52af14b37 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -117,7 +117,7 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
     ai_assert(strMode != nullptr);
     FILE *file;
 #ifdef _WIN32
-    std::string name = Utf8ToWide(strFile);
+    std::wstring name = Utf8ToWide(strFile);
     if (name.empty()) {
         return nullptr;
     }

From f8dd3a9aa6b5104d94070ca5341484b35ac3c7c1 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Wed, 20 Jan 2021 08:05:43 +0100
Subject: [PATCH 5/5] Update DefaultIOSystem.cpp

---
 code/Common/DefaultIOSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index 52af14b37..4154aad32 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -122,7 +122,7 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
         return nullptr;
     }
     
-    file = ::_wfopen(, Utf8ToWide(strMode).c_str());
+    file = ::_wfopen(name.c_str(), Utf8ToWide(strMode).c_str());
 #else
     file = ::fopen(strFile, strMode);
 #endif