From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / hacks / glx / bouncingcow.c

diff --git a/hacks/glx/bouncingcow.c b/hacks/glx/bouncingcow.c
index a2faf1f8190549e002987f681d8c53b082fdf8db..0773414dd79e737734a4bf1780bb903693d72a50 100644 (file)
--- a/hacks/glx/bouncingcow.c
+++ b/hacks/glx/bouncingcow.c
@@ -211,6 +211,7 @@ load_texture (ModeInfo *mi, const char *filename)
     }
 
   image = xpm_file_to_ximage (dpy, visual, cmap, filename);
+  if (!image) return False;
 
   clear_gl_error();
   glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
@@ -238,14 +239,7 @@ init_cow (ModeInfo *mi)
   int i;
   Bool tex_p = False;
 
-  if (!bps) {
-    bps = (cow_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (cow_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps, NULL);
 
   bp = &bps[MI_SCREEN(mi)];