From a10cca1e937abcc4a82f7a5245db2e44ee33f69c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 12 Nov 2007 13:30:24 -0800 Subject: [PATCH] shell32: don't crash if $HOME is not set --- dlls/shell32/shellpath.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9e832c1..5be77d7 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2065,8 +2065,6 @@ static void _SHCreateSymbolicLinks(void) } } - HeapFree(GetProcessHeap(), 0, pszPersonal); - /* Create symbolic links for 'My Pictures', 'My Video' and 'My Music'. */ for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { /* Create the current 'My Whatever' folder and get it's unix path. */ @@ -2094,7 +2092,12 @@ static void _SHCreateSymbolicLinks(void) } /* Last but not least, the Desktop folder */ - strcpy(szDesktopTarget, pszHome); + if (pszHome) + strcpy(szDesktopTarget, pszHome); + else + strcpy(szDesktopTarget, pszPersonal); + HeapFree(GetProcessHeap(), 0, pszPersonal); + if (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) { -- 1.4.1