summaryrefslogtreecommitdiffstats
path: root/utils/erase.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:58 +0100
committerSimon Rettberg2019-02-18 11:55:58 +0100
commitaa7530630e595b80d5db54655fd827b61edc0fd7 (patch)
tree048cb74072450c7592f254c3537ac8f252d09d73 /utils/erase.c
parentForgot one DPMS killing instance (diff)
parentUpdate to 5.42 (diff)
downloadxscreensaver-23.tar.gz
xscreensaver-23.tar.xz
xscreensaver-23.zip
Merge branch 'master' into openslxv23
Diffstat (limited to 'utils/erase.c')
-rw-r--r--utils/erase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/erase.c b/utils/erase.c
index ae15ac8..fdf7496 100644
--- a/utils/erase.c
+++ b/utils/erase.c
@@ -750,7 +750,7 @@ eraser_init (Display *dpy, Window window)
which = -1;
else
which = get_integer_resource(dpy, "eraseMode", "Integer");
- free (s);
+ if (s) free (s);
if (which < 0 || which >= countof(erasers))
which = random() % countof(erasers);