From b79ed5c838650c79ea4cbb6d88d96d4c111a3b8d Mon Sep 17 00:00:00 2001 From: Hlieb Romanov Date: Thu, 13 Jun 2019 10:14:05 +0300 Subject: [PATCH] Return empty string from FindLatestAppDir() in case of error instead of NULL. Related to Squirrel/Squirrel.Windows#1500 --- src/StubExecutable/StubExecutable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/StubExecutable/StubExecutable.cpp b/src/StubExecutable/StubExecutable.cpp index 6299dec57..2d8f0cf65 100644 --- a/src/StubExecutable/StubExecutable.cpp +++ b/src/StubExecutable/StubExecutable.cpp @@ -50,7 +50,7 @@ std::wstring FindLatestAppDir() WIN32_FIND_DATA fileInfo = { 0 }; HANDLE hFile = FindFirstFile(ourDir.c_str(), &fileInfo); if (hFile == INVALID_HANDLE_VALUE) { - return NULL; + return std::wstring(); } version::Semver200_version acc("0.0.0"); @@ -74,7 +74,7 @@ std::wstring FindLatestAppDir() } while (FindNextFile(hFile, &fileInfo)); if (acc == version::Semver200_version("0.0.0")) { - return NULL; + return std::wstring(); } ourDir.assign(FindRootAppDir());