PKGBUILDs/extra/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch

15 lines
682 B
Diff
Raw Normal View History

2017-09-21 12:33:30 +00:00
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;