From b9dc4ac09c3febff1a9ac96b4c3f807e1b8f821b Mon Sep 17 00:00:00 2001
From: Tom Finegan <tomfinegan@google.com>
Date: Tue, 8 Mar 2016 10:07:43 -0800
Subject: [PATCH] test_util: Don't pass NULL to std::string() in
 GetTestDataDir().

Change-Id: Iaafa78a17580d962e260d9553b11d2cd3cb4726f
Also: quiet MSVC warnings that suggest making code non-portable.
---
 testing/test_util.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/testing/test_util.cc b/testing/test_util.cc
index 539d081..ad1f09c 100644
--- a/testing/test_util.cc
+++ b/testing/test_util.cc
@@ -10,6 +10,9 @@
 #include <sys/stat.h>
 #ifndef _MSC_VER
 #include <unistd.h>  // close()
+#else
+// Disable MSVC warnings that suggest making code non-portable.
+#pragma warning(disable:4996)
 #endif
 
 #include <cstdint>
@@ -28,7 +31,8 @@ namespace libwebm {
 namespace test {
 
 std::string GetTestDataDir() {
-  return std::getenv("LIBWEBM_TEST_DATA_PATH");
+  const char* test_data_path = std::getenv("LIBWEBM_TEST_DATA_PATH");
+  return test_data_path ? std::string(test_data_path) : std::string();
 }
 
 std::string GetTestFilePath(const std::string& name) {