X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fbitio.c;h=b3cdf240e0643122591c0aaf83dae83a83e9e2ee;hp=1e5594a449b1e8936710a95149d82373eb4e3d13;hb=fb4dfe198650e8ab64eacffc334389d5fe186355;hpb=ffced7be7e48df002cef8d7f6999308ed94f50da diff --git a/lib/bitio.c b/lib/bitio.c index 1e5594a..b3cdf24 100644 --- a/lib/bitio.c +++ b/lib/bitio.c @@ -1,11 +1,22 @@ -/* bitio.c - implementation of bitio.h. +/* bitio.c + part of swftools + implementation of bitio.h. - Part of the swftools package. - - Copyright (c) 2001 Matthias Kramm + Copyright (C) 2003 Matthias Kramm - This file is distributed under the GPL, see file COPYING for details */ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include @@ -21,6 +32,27 @@ #endif #include "./bitio.h" +/* ---------------------------- null reader ------------------------------- */ + +static int reader_nullread(struct reader_t*r, void* data, int len) +{ + memset(data, 0, len); + return len; +} +static void reader_nullread_dealloc(struct reader_t*r) +{ + memset(r, 0, sizeof(struct reader_t)); +} +void reader_init_nullreader(struct reader_t*r) +{ + r->read = reader_nullread; + r->dealloc = reader_nullread_dealloc; + r->internal = 0; + r->type = READER_TYPE_NULL; + r->mybyte = 0; + r->bitpos = 8; + r->pos = 0; +} /* ---------------------------- file reader ------------------------------- */ static int reader_fileread(struct reader_t*reader, void* data, int len) @@ -57,16 +89,23 @@ static int reader_memread(struct reader_t*reader, void* data, int len) return len; } else { memcpy(data, &mr->data[reader->pos], mr->length - reader->pos); - reader->pos = mr->length; + reader->pos += mr->length; return mr->length - reader->pos; } } +static void reader_memread_dealloc(struct reader_t*reader) +{ + if(reader->internal) + free(reader->internal); + memset(reader, 0, sizeof(struct reader_t)); +} void reader_init_memreader(struct reader_t*r, void*newdata, int newlength) { struct memread_t*mr = malloc(sizeof(struct memread_t)); mr->data = newdata; mr->length = newlength; r->read = reader_memread; + r->dealloc = reader_memread_dealloc; r->internal = (void*)mr; r->type = READER_TYPE_MEM; r->mybyte = 0; @@ -84,7 +123,7 @@ struct memwrite_t static int writer_memwrite_write(struct writer_t*w, void* data, int len) { - struct memread_t*mw = (struct memread_t*)w->internal; + struct memwrite_t*mw = (struct memwrite_t*)w->internal; if(mw->length - w->pos > len) { memcpy(&mw->data[w->pos], data, len); w->pos += len; @@ -97,7 +136,9 @@ static int writer_memwrite_write(struct writer_t*w, void* data, int len) } static void writer_memwrite_finish(struct writer_t*w) { - free(w->internal); + if(w->internal) + free(w->internal); + w->internal = 0; } void writer_init_memwriter(struct writer_t*w, void*data, int len) { @@ -109,7 +150,73 @@ void writer_init_memwriter(struct writer_t*w, void*data, int len) w->write = writer_memwrite_write; w->finish = writer_memwrite_finish; w->internal = (void*)mr; - w->type = WRITER_TYPE_FILE; + w->type = WRITER_TYPE_MEM; + w->bitpos = 0; + w->mybyte = 0; + w->pos = 0; +} + +/* ------------------------- growing mem writer ------------------------------- */ + +struct growmemwrite_t +{ + unsigned char*data; + int length; +}; +static int writer_growmemwrite_write(struct writer_t*w, void* data, int len) +{ + struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal; + if(!mw->data) { + fprintf(stderr, "Illegal write operation: data already given away"); + exit(1); + } + if(mw->length - w->pos <= len) { + unsigned char*newmem; + int newlength = mw->length; + while(newlength - w->pos < len) { + newlength += 4096; + } + newmem = malloc(newlength); + memcpy(newmem, mw->data, mw->length); + free(mw->data); + mw->data = newmem; + mw->length = newlength; + } + memcpy(&mw->data[w->pos], data, len); + w->pos += len; + return len; +} +static void writer_growmemwrite_finish(struct writer_t*w) +{ + struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal; + if(mw->data) + free(mw->data); + mw->data = 0; + mw->length = 0; + free(w->internal);mw=0; + memset(w, 0, sizeof(struct writer_t)); +} +void* writer_growmemwrite_getmem(struct writer_t*w) +{ + struct growmemwrite_t*mw = (struct growmemwrite_t*)w->internal; + void*ret = mw->data; + /* remove own reference so that neither write() nor finish() can free it. + It's property of the caller now. + */ + mw->data = 0; + return ret; +} +void writer_init_growingmemwriter(struct writer_t*w) +{ + struct memwrite_t *mr; + mr = malloc(sizeof(struct memwrite_t)); + mr->length = 4096; + mr->data = malloc(mr->length); + memset(w, 0, sizeof(struct writer_t)); + w->write = writer_growmemwrite_write; + w->finish = writer_growmemwrite_finish; + w->internal = (void*)mr; + w->type = WRITER_TYPE_GROWING_MEM; w->bitpos = 0; w->mybyte = 0; w->pos = 0; @@ -133,7 +240,8 @@ static void writer_filewrite_finish(struct writer_t*w) struct filewrite_t *mr = (struct filewrite_t*)w->internal; if(mr->free_handle) close(mr->handle); - free(mr); + free(w->internal); + memset(w, 0, sizeof(struct writer_t)); } void writer_init_filewriter(struct writer_t*w, int handle) { @@ -160,7 +268,29 @@ void writer_init_filewriter2(struct writer_t*w, char*filename) ((struct filewrite_t*)w->internal)->free_handle = 1; } -/* ---------------------------- zlibinflate writer -------------------------- */ +/* ---------------------------- null writer ------------------------------- */ + +static int writer_nullwrite_write(struct writer_t*w, void* data, int len) +{ + w->pos += len; + return len; +} +static void writer_nullwrite_finish(struct writer_t*w) +{ + memset(w, 0, sizeof(struct writer_t)); +} +void writer_init_nullwriter(struct writer_t*w) +{ + memset(w, 0, sizeof(struct writer_t)); + w->write = writer_nullwrite_write; + w->finish = writer_nullwrite_finish; + w->internal = 0; + w->type = WRITER_TYPE_NULL; + w->bitpos = 0; + w->mybyte = 0; + w->pos = 0; +} +/* ---------------------------- zlibinflate reader -------------------------- */ struct zlibinflate_t { @@ -189,7 +319,6 @@ static int reader_zlibinflate(struct reader_t*reader, void* data, int len) struct zlibinflate_t*z = (struct zlibinflate_t*)reader->internal; int ret; if(!z) { - fprintf(stderr, "zlib not initialized!\n"); return 0; } if(!len) @@ -231,6 +360,18 @@ static int reader_zlibinflate(struct reader_t*reader, void* data, int len) exit(1); #endif } +static void reader_zlibinflate_dealloc(struct reader_t*reader) +{ +#ifdef HAVE_ZLIB + struct zlibinflate_t*z = (struct zlibinflate_t*)reader->internal; + /* test whether read() already did basic deallocation */ + if(reader->internal) { + inflateEnd(&z->zs); + free(reader->internal); + } + memset(reader, 0, sizeof(struct reader_t)); +#endif +} void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) { #ifdef HAVE_ZLIB @@ -241,6 +382,7 @@ void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) memset(z, 0, sizeof(struct zlibinflate_t)); r->internal = z; r->read = reader_zlibinflate; + r->dealloc = reader_zlibinflate_dealloc; r->type = READER_TYPE_ZLIB; r->pos = 0; z->input = input; @@ -272,6 +414,10 @@ static int writer_zlibdeflate_write(struct writer_t*writer, void* data, int len) #ifdef HAVE_ZLIB struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal; int ret; + if(writer->type != WRITER_TYPE_ZLIB) { + fprintf(stderr, "Wrong writer ID (writer not initialized?)\n"); + return 0; + } if(!z) { fprintf(stderr, "zlib not initialized!\n"); return 0; @@ -310,6 +456,10 @@ static void writer_zlibdeflate_finish(struct writer_t*writer) struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal; struct writer_t*output; int ret; + if(writer->type != WRITER_TYPE_ZLIB) { + fprintf(stderr, "Wrong writer ID (writer not initialized?)\n"); + return; + } if(!z) return; output= z->output; @@ -332,8 +482,8 @@ static void writer_zlibdeflate_finish(struct writer_t*writer) ret = deflateEnd(&z->zs); if (ret != Z_OK) zlib_error(ret, "bitio:deflate_end", &z->zs); free(writer->internal); - writer->internal = 0; - output->finish(output); + memset(writer, 0, sizeof(struct writer_t)); + //output->finish(output); #else fprintf(stderr, "Error: swftools was compiled without zlib support"); exit(1); @@ -425,4 +575,3 @@ void reader_resetbits(struct reader_t*r) r->bitpos = 8; } -