commit bab0302b47e8667e23d7e762ae40aa13e5ba73c9
author Jamie Madill <jmadill@chromium.org> Wed Jan 16 14:12:28 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Jan 16 21:20:58 2019 +0000
tree 206858a7ce564be05ae705ca37ef343ddeb9c391
parent 465d6090cd386947f40bd93a81cd1e61084af994

Make path utils return std::string.

This avoids potential issues with returning local variables. It
also solves potential threading conflicts by returning the string
value instead of a pointer. The code should be optimized with RVO
with a modern c++ compiler.

Bug: angleproject:2601
Change-Id: I8a01702d2675a17dd060f27920105efab0c49454
Reviewed-on: https://chromium-review.googlesource.com/c/1415910
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/RendererVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index e48893e..f746742 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -366,8 +366,8 @@
             else
             {
                 mPreviousCWD       = cwd.value();
-                const char *exeDir = angle::GetExecutableDirectory();
-                mChangedCWD        = angle::SetCWD(exeDir);
+                std::string exeDir = angle::GetExecutableDirectory();
+                mChangedCWD        = angle::SetCWD(exeDir.c_str());
                 if (!mChangedCWD)
                 {
                     ERR() << "Error setting CWD for Vulkan layers init.";