X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fbitio.c;h=97c864ace797bf17292f3d8f4ad317bcf94ac36f;hb=57daf2c90dc409a2aa7030ce6ce996707e99967b;hp=90c3fe6330b97dd9cfbbb53a7a64e41160436e9d;hpb=6c3ab5574d31504d24710c2756899d49275c1a37;p=swftools.git

diff --git a/lib/bitio.c b/lib/bitio.c
index 90c3fe6..97c864a 100644
--- a/lib/bitio.c
+++ b/lib/bitio.c
@@ -89,15 +89,12 @@ static int reader_memread(reader_t*reader, void* data, int len)
 {
     struct memread_t*mr = (struct memread_t*)reader->internal;
 
-    if(mr->length - reader->pos > len) {
-	memcpy(data, &mr->data[reader->pos], len);
-	reader->pos += len;
-	return len;
-    } else {
-	memcpy(data, &mr->data[reader->pos], mr->length - reader->pos);
-	reader->pos += mr->length;
-	return mr->length - reader->pos;
+    if(mr->length - reader->pos < len) {
+	len = mr->length - reader->pos;
     }
+    memcpy(data, &mr->data[reader->pos], len);
+    reader->pos += len;
+    return len;
 }
 static void reader_memread_dealloc(reader_t*reader)
 {
@@ -149,7 +146,7 @@ static void writer_memwrite_finish(writer_t*w)
 void writer_init_memwriter(writer_t*w, void*data, int len)
 {
     struct memwrite_t *mr;
-    mr = (memwrite_t *)malloc(sizeof(struct memwrite_t));
+    mr = (struct memwrite_t*)malloc(sizeof(struct memwrite_t));
     mr->data = (unsigned char *)data;
     mr->length = len;
     memset(w, 0, sizeof(writer_t));
@@ -178,13 +175,12 @@ static int writer_growmemwrite_write(writer_t*w, void* data, int len)
 	exit(1);
     }
     if(mw->length - w->pos < len) {
-	unsigned char*newmem;
 	int newlength = mw->length;
 	while(newlength - w->pos < len) {
 	    newlength += mw->grow;
 	}
 #ifdef NO_REALLOC
-	newmem = (unsigned char*)malloc(newlength);
+	unsigned char*newmem = (unsigned char*)malloc(newlength);
 	memcpy(newmem, mw->data, mw->length);
 	free(mw->data);
 	mw->data = newmem;
@@ -200,13 +196,21 @@ static int writer_growmemwrite_write(writer_t*w, void* data, int len)
 static void writer_growmemwrite_finish(writer_t*w)
 {
     struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
-    if(mw->data)
-	free(mw->data);
-    mw->data = 0;
+    if(mw->data) {
+	free(mw->data);mw->data = 0;
+    }
     mw->length = 0;
     free(w->internal);mw=0;
     memset(w, 0, sizeof(writer_t));
 }
+void* writer_growmemwrite_memptr(writer_t*w, int*len)
+{
+    struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
+    if(len) {
+	*len = w->pos;
+    }
+    return mw->data;
+}
 void* writer_growmemwrite_getmem(writer_t*w)
 {
     struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
@@ -217,17 +221,24 @@ void* writer_growmemwrite_getmem(writer_t*w)
     mw->data = 0;
     return ret;
 }
+void writer_growmemwrite_reset(writer_t*w)
+{
+    struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal;
+    w->pos = 0;
+    w->bitpos = 0;
+    w->mybyte = 0;
+}
 void writer_init_growingmemwriter(writer_t*w, U32 grow)
 {
-    struct growmemwrite_t *mr;
-    mr = (struct growmemwrite_t *)malloc(sizeof(struct growmemwrite_t));
-    mr->length = 4096;
-    mr->data = (unsigned char *)malloc(mr->length);
-    mr->grow = grow;
+    struct growmemwrite_t *mw;
+    mw = (struct growmemwrite_t *)malloc(sizeof(struct growmemwrite_t));
+    mw->length = 4096;
+    mw->data = (unsigned char *)malloc(mw->length);
+    mw->grow = grow;
     memset(w, 0, sizeof(writer_t));
     w->write = writer_growmemwrite_write;
     w->finish = writer_growmemwrite_finish;
-    w->internal = (void*)mr;
+    w->internal = (void*)mw;
     w->type = WRITER_TYPE_GROWING_MEM;
     w->bitpos = 0;
     w->mybyte = 0;
@@ -591,29 +602,39 @@ void reader_resetbits(reader_t*r)
 
 U8 reader_readU8(reader_t*r)
 {
-    U8 b;
-    r->read(r, &b, 1);
+    U8 b = 0;
+    if(r->read(r, &b, 1)<1) {
+	fprintf(stderr, "bitio.c:reader_readU8: Read over end of memory region\n");
+    }
     return b;
 }
 U16 reader_readU16(reader_t*r)
 {
-    U8 b1,b2;
-    r->read(r, &b1, 1);
-    r->read(r, &b2, 1);
+    U8 b1=0,b2=0;
+    if(r->read(r, &b1, 1)<1) {
+	fprintf(stderr, "bitio.c:reader_readU16: Read over end of memory region\n");
+    }
+    if(r->read(r, &b2, 1)<1) {
+	fprintf(stderr, "bitio.c:reader_readU16: Read over end of memory region\n");
+    }
     return b1|b2<<8;
 }
 U32 reader_readU32(reader_t*r)
 {
-    U8 b1,b2,b3,b4;
-    r->read(r, &b1, 1);
-    r->read(r, &b2, 1);
-    r->read(r, &b3, 1);
-    r->read(r, &b4, 1);
+    U8 b1=0,b2=0,b3=0,b4=0;
+    if(r->read(r, &b1, 1)<1)
+	fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
+    if(r->read(r, &b2, 1)<1)
+	fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
+    if(r->read(r, &b3, 1)<1)
+	fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
+    if(r->read(r, &b4, 1)<1)
+	fprintf(stderr, "bitio.c:reader_readU32: Read over end of memory region\n");
     return b1|b2<<8|b3<<16|b4<<24;
 }
 float reader_readFloat(reader_t*r)
 {
-    U8 b1,b2,b3,b4;
+    U8 b1=0,b2=0,b3=0,b4=0;
     r->read(r, &b1, 1);
     r->read(r, &b2, 1);
     r->read(r, &b3, 1);
@@ -643,7 +664,7 @@ char*reader_readString(reader_t*r)
 	    break;
     }
     char*string = (char*)writer_growmemwrite_getmem(&g);
-    writer_growmemwrite_finish(&g);
+    g.finish(&g);
     return string;
 }