aboutsummaryrefslogtreecommitdiff
path: root/src/libs/dutil/WixToolset.DUtil/path3utl.cpp
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2022-12-24 21:40:26 -0500
committerBob Arnson <github@bobs.org>2022-12-25 10:35:30 -0500
commit6d597c3fdee0833007f206d2d29e19c2b44c5b4d (patch)
tree9c89ce6188f56d67a6d013baf47878f63d02f15e /src/libs/dutil/WixToolset.DUtil/path3utl.cpp
parent156ccd9db15eafe6b4fef72097dfa04337599f91 (diff)
downloadwix-6d597c3fdee0833007f206d2d29e19c2b44c5b4d.tar.gz
wix-6d597c3fdee0833007f206d2d29e19c2b44c5b4d.tar.bz2
wix-6d597c3fdee0833007f206d2d29e19c2b44c5b4d.zip
Handle case where TMP isn't REG_EXPAND_SZ.
Diffstat (limited to '')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/path3utl.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/path3utl.cpp b/src/libs/dutil/WixToolset.DUtil/path3utl.cpp
index 844cbfbb..999a99ac 100644
--- a/src/libs/dutil/WixToolset.DUtil/path3utl.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/path3utl.cpp
@@ -136,6 +136,11 @@ static HRESULT GetTempPathFromSystemEnvironmentVariable(
136 hr = EnvExpandEnvironmentStringsForUser(NULL, sczValue, psczPath, NULL); 136 hr = EnvExpandEnvironmentStringsForUser(NULL, sczValue, psczPath, NULL);
137 PathExitOnFailure(hr, "Failed to expand environment variables for system in string: %ls", sczValue); 137 PathExitOnFailure(hr, "Failed to expand environment variables for system in string: %ls", sczValue);
138 } 138 }
139 else
140 {
141 hr = StrAllocString(psczPath, sczValue, 0);
142 PathExitOnFailure(hr, "Failed to copy environment variable: %ls", wzName);
143 }
139 144
140 hr = PathBackslashTerminate(psczPath); 145 hr = PathBackslashTerminate(psczPath);
141 PathExitOnFailure(hr, "Failed to backslash terminate system '%ls' value.", wzName); 146 PathExitOnFailure(hr, "Failed to backslash terminate system '%ls' value.", wzName);