dtsession: fix VU#497553

2012-05-26 19:29:50 -06:00
parent b4f3efb692
commit 9526740ddd
3 changed files with 47 additions and 8 deletions
--- a/cde/programs/dtsession/SmXdef.c
+++ b/cde/programs/dtsession/SmXdef.c
@@ -91,13 +91,17 @@ void
 SmXdefMerge(Display *display)
 {
  char *xdefaults;
+  char *home;

 /*
  * Load .Xdefaults
  */
-  if( (xdefaults = (char *)malloc(strlen(getenv("HOME"))+12)) != NULL)  
+  if ((home = getenv("HOME")) == NULL)
+    home = "";
+
+  if( (xdefaults = (char *)malloc(strlen(home)+12)) != NULL)  
  {
-    sprintf(xdefaults,"%s/%s",getenv("HOME"),".Xdefaults");
+    sprintf(xdefaults,"%s/%s",home,".Xdefaults");
    if(access(xdefaults,R_OK) == 0)
    {
      FILE *fp;