diff options
| author | Bruno Cichon <ebrasca.ebrasca@openmailbox.org> | 2017-10-23 22:49:24 +0200 |
|---|---|---|
| committer | Bruno Cichon <ebrasca.ebrasca@openmailbox.org> | 2017-10-23 22:49:24 +0200 |
| commit | c848d16bc0f67f04a4b8512a8e2f3651723c5507 (patch) | |
| tree | f99e4992773998f7132e7c106713a19179fed874 /libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch | |
| parent | 0bf95161fce1f6a90aabf83b9daff7e75f97e9bd (diff) | |
| parent | 5654d526bd32b2bb1db29be4a0e06ac2fc01c878 (diff) | |
| download | abslibre-c848d16bc0f67f04a4b8512a8e2f3651723c5507.tar.gz abslibre-c848d16bc0f67f04a4b8512a8e2f3651723c5507.tar.bz2 abslibre-c848d16bc0f67f04a4b8512a8e2f3651723c5507.zip | |
Merge branch 'master' of ssh://git.parabola.nu:1863/~git/abslibre
Diffstat (limited to 'libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch')
| -rw-r--r-- | libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch b/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch deleted file mode 100644 index b9e81f9a3..000000000 --- a/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch +++ /dev/null @@ -1,14 +0,0 @@ -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; |