Imager 0.58 release

[imager.git] / datatypes.c

diff --git a/datatypes.c b/datatypes.c
index 33d27a5f16672e5fb6c71988318b7611294f98c3..9c04b189ab27de585484d5056ec00220cca3a349 100644 (file)
--- a/datatypes.c
+++ b/datatypes.c
@@ -1,9 +1,7 @@
-#include "io.h"
-#include "datatypes.h"
 #include <stdlib.h>
 #include <stdio.h>
-
-
+#include <string.h>
+#include "imager.h"
 
 /*
   2d bitmask with test and set operations
@@ -12,9 +10,15 @@
 struct i_bitmap*
 btm_new(int xsize,int ysize) {
   int i;
+  int bytes;
   struct i_bitmap *btm;
-  btm=(struct i_bitmap*)mymalloc(sizeof(struct i_bitmap));
-  btm->data=(char*)mymalloc((xsize*ysize+8)/8);
+  btm=(struct i_bitmap*)mymalloc(sizeof(struct i_bitmap)); /* checked 4jul05 tonyc */
+  bytes = (xsize*ysize+8)/8;
+  if (bytes * 8 / ysize < xsize-1) { /* this is kind of rough */
+    fprintf(stderr, "Integer overflow allocating bitmap %d x %d", xsize, ysize);
+    exit(3);
+  }
+  btm->data=(char*)mymalloc(bytes); /* checked 4jul05 tonyc */
   btm->xsize=xsize;
   btm->ysize=ysize;
   for(i=0;i<(xsize*ysize+8)/8;i++) btm->data[i]=0; /* Is this always needed */
@@ -40,6 +44,7 @@ btm_test(struct i_bitmap *btm,int x,int y) {
 void
 btm_set(struct i_bitmap *btm,int x,int y) {
   int btno;
+  if (x<0 || x>btm->xsize-1 || y<0 || y>btm->ysize-1) abort();
   btno=btm->xsize*y+x;
   btm->data[btno/8]|=1<<(btno%8);
 }
@@ -55,11 +60,11 @@ btm_set(struct i_bitmap *btm,int x,int y) {
 struct llink *
 llink_new(struct llink* p,int size) {
   struct llink *l;
-  l       = mymalloc(sizeof(struct llink));
+  l       = mymalloc(sizeof(struct llink)); /* checked 4jul05 tonyc */
   l->n    = NULL;
   l->p    = p;
   l->fill = 0;
-  l->data = mymalloc(size);
+  l->data = mymalloc(size); /* checked 4jul05 tonyc - depends on caller to llist_push */
   return l;
 }
 
@@ -96,7 +101,7 @@ llist_llink_push(struct llist *lst, struct llink *lnk,void *data) {
 struct llist *
 llist_new(int multip, int ssize) {
   struct llist *l;
-  l         = mymalloc(sizeof(struct llist));
+  l         = mymalloc(sizeof(struct llist)); /* checked 4jul05 tonyc */
   l->h      = NULL;
   l->t      = NULL;
   l->multip = multip;
@@ -127,7 +132,7 @@ llist_push(struct llist *l,void *data) {
   }
   /*   fprintf(stderr,"0x%08X\n",l->t); */
   if (llist_llink_push(l,l->t,data)) { 
-    m_fatal(3, "out of memory\n");
+    i_fatal(3, "out of memory\n");
   }
 }
 
@@ -197,7 +202,7 @@ octt_new() {
   int i;
   struct octt *t;
   
-  t=(struct octt*)mymalloc(sizeof(struct octt));
+  t=(struct octt*)mymalloc(sizeof(struct octt)); /* checked 4jul05 tonyc */
   for(i=0;i<8;i++) t->t[i]=NULL;
   t->cnt=0;
   return t;