summarylogtreecommitdiffstats
path: root/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
blob: b9e81f9a32fe622fc38b172fd617fcdaf115fc41 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h
index b096d2120cb..3c849e82d3b 100644
--- a/src/gallium/drivers/swr/rasterizer/core/utils.h
+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h
@@ -365,7 +365,8 @@ static INLINE std::string GetEnv(const std::string& variableName)
     output.resize(valueSize - 1); // valueSize includes null, output.resize() does not
     GetEnvironmentVariableA(variableName.c_str(), &output[0], valueSize);
 #else
-    output = getenv(variableName.c_str());
+    char *o = getenv(variableName.c_str());
+    output = o ? std::string(o) : std::string();
 #endif
 
     return output;