http://www.jwz.org/xscreensaver/xscreensaver-5.11.tar.gz

[xscreensaver] / hacks / screenhack.c

diff --git a/hacks/screenhack.c b/hacks/screenhack.c
index f90289d1edbc929fefe5440f0c5289aa35050627..bd251dc566a3a8f65096d71beffd67f3390e7e50 100644 (file)
--- a/hacks/screenhack.c
+++ b/hacks/screenhack.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2008 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2010 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -221,6 +221,8 @@ merge_options (void)
          strcat (newr, oldr);
          *s = newr;
        }
+      else
+        *s = strdup (*s);
   }
 }
 
@@ -806,6 +808,12 @@ main (int argc, char **argv)
       exit (help_p ? 0 : 1);
     }
 
+  {
+    char **s;
+    for (s = merged_defaults; *s; s++)
+      free(*s);
+  }
+
   free (merged_options);
   free (merged_defaults);
   merged_options = 0;