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

[xscreensaver] / hacks / glx / topblock.c

diff --git a/hacks/glx/topblock.c b/hacks/glx/topblock.c
index ef3ca0623206e398a7b2527517e3a69dd36c0252..f794b197db2d285c63e0111ccce12e4b8d40c0f6 100644 (file)
--- a/hacks/glx/topblock.c
+++ b/hacks/glx/topblock.c
@@ -189,10 +189,7 @@ init_topBlock (ModeInfo *mi)
   if (!tbs) {
     tbs = (topBlockSTATE *)
       calloc (MI_NUM_SCREENS(mi), sizeof (topBlockSTATE));
-    if (!tbs) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
+    if (!tbs) abort();
   }
 
   tb = &tbs[MI_SCREEN(mi)];
@@ -576,16 +573,18 @@ static void generateNewBlock(ModeInfo *mi)
                tb->numFallingBlocks++;
                llTail = tb->blockNodeRoot; 
                if (llTail == NULL) {
-                       if ((llCurrent = ((NODE*) malloc(sizeof(NODE)))) == NULL) {     fprintf(stderr, "%s: out of memory.\n", progname); }
-                       llTail = llCurrent;
-                       tb->blockNodeRoot = llCurrent; 
+                  llCurrent = ((NODE*) malloc(sizeof(NODE)));
+                  if (!llCurrent) abort();
+                  llTail = llCurrent;
+                  tb->blockNodeRoot = llCurrent; 
                } else {
                        if (tb->numFallingBlocks>=maxFalling) {
                                /* recycle */
                                llCurrent=llTail->next;
                                tb->blockNodeRoot=llCurrent->next;
                        } else {
-                               if ((llCurrent = ((NODE*) malloc(sizeof(NODE)))) == NULL) {     fprintf(stderr, "%s: out of memory..\n", progname); }
+                          llCurrent = ((NODE*) malloc(sizeof(NODE)));
+                          if (!llCurrent) abort();
                        }
                        while (llTail->next != NULL) { llTail = llTail->next; } /* find last item in list */
                }