X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fxpm-ximage.c;h=44f64dbf3d97ae2425e03d11ce326fdc9a642045;hb=f65151994eba80ecabcdac6eef6fa0dde7e2d45b;hp=5913ddddac05b4474b8e34a3a3c20f10badb8ac2;hpb=2a991a811de4c7b22f812682b267b616a809fd9a;p=xscreensaver

diff --git a/hacks/glx/xpm-ximage.c b/hacks/glx/xpm-ximage.c
index 5913dddd..44f64dbf 100644
--- a/hacks/glx/xpm-ximage.c
+++ b/hacks/glx/xpm-ximage.c
@@ -63,6 +63,8 @@ xpm_to_ximage (Display *dpy, Visual *visual, Colormap cmap, char **xpm_data)
   int bpl, wpl;
   XColor colors[255];
 
+  memset (&xpm_image, 0, sizeof(xpm_image));
+  memset (&xpm_info, 0, sizeof(xpm_info));
   result = XpmCreateXpmImageFromData (xpm_data, &xpm_image, &xpm_info);
   if (result != XpmSuccess)
     {
@@ -122,8 +124,10 @@ xpm_to_ximage (Display *dpy, Visual *visual, Colormap cmap, char **xpm_data)
   }
 
   /* I sure hope these only free the contents, and not the args. */
+#if 0  /* Apparently not?  Gotta love those well-documented APIs! */
   XpmFreeXpmImage (&xpm_image);
   XpmFreeXpmInfo (&xpm_info);
+#endif
 
   return ximage;
 }