Changeset fa3290d for fmtext.c

Timestamp:

May 16, 2007, 10:21:30 PM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ec53338

Parents:

6933082

Message:

Do not initialize the colorpair manager array if we don't have
colors. More specifically, do not write into arrays we have not
allocated and segfault.

File:

• fmtext.c (modified) (2 diffs)

fmtext.c

@@ -701 +701 @@
     }
   }
-  for(i = 0; i < 8; i++) {
-    short fg, bg;
-    pair_content(i, &fg, &bg);
-    cpmgr->pairs[fg+1][bg+1] = i;
+  if (owl_global_get_hascolors(&g)) {
+    for(i = 0; i < 8; i++) {
+      short fg, bg;
+      if (i >= COLORS) continue;
+      pair_content(i, &fg, &bg);
+      cpmgr->pairs[fg+1][bg+1] = i;
+    }
   }
 }
@@ -711 +714 @@
 void owl_fmtext_reset_colorpairs()
 {
-  short i, j;
-  owl_colorpair_mgr *cpmgr = owl_global_get_colorpair_mgr(&g);
-  cpmgr->next = 8;
-
-  // The test is <= because we allocated COLORS+1 entries.
-  for(i = 0; i <= COLORS; i++) {
-    for(j = 0; j <= COLORS; j++) {
-      cpmgr->pairs[i][j] = -1;
-    }
-  }
-  for(i = 0; i < 8; i++) {
-    short fg, bg;
-    pair_content(i, &fg, &bg);
-    cpmgr->pairs[fg+1][bg+1] = i;
+  if (owl_global_get_hascolors(&g)) {
+    short i, j;
+    owl_colorpair_mgr *cpmgr = owl_global_get_colorpair_mgr(&g);
+    cpmgr->next = 8;
+    
+    // The test is <= because we allocated COLORS+1 entries.
+    for(i = 0; i <= COLORS; i++) {
+      for(j = 0; j <= COLORS; j++) {
+        cpmgr->pairs[i][j] = -1;
+      }
+    }
+    for(i = 0; i < 8; i++) {
+      short fg, bg;
+      if (i >= COLORS) continue;
+      pair_content(i, &fg, &bg);
+      cpmgr->pairs[fg+1][bg+1] = i;
+    }
   }
 }