From 8b99ea031d6c12404d435a38fc3440ef69c1937b Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 21 Jan 2001 11:09:42 +0000 Subject: [PATCH] Use xmalloc_zero() instead of xmalloc(), thus squashing several uninitialized structure field bugs. Also simplified the code a lot. --- lib/fb-mem.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/fb-mem.c b/lib/fb-mem.c index db0f4132..54fe8bfa 100644 --- a/lib/fb-mem.c +++ b/lib/fb-mem.c @@ -123,20 +123,15 @@ fbmem_close(struct fastbuf *f) struct fastbuf * fbmem_create(unsigned blocksize) { - struct fastbuf *f = xmalloc(sizeof(struct fastbuf)); - struct memstream *m = xmalloc(sizeof(struct memstream)); + struct fastbuf *f = xmalloc_zero(sizeof(struct fastbuf)); + struct memstream *m = xmalloc_zero(sizeof(struct memstream)); m->blocksize = blocksize; m->uc = 1; - m->first = NULL; - f->bptr = f->bstop = f->buffer = f->bufend = NULL; - f->pos = f->fdpos = 0; f->name = ""; f->lldata = m; - f->refill = NULL; f->spout = fbmem_spout; - f->seek = NULL; f->close = fbmem_close; return f; } @@ -144,19 +139,15 @@ fbmem_create(unsigned blocksize) struct fastbuf * fbmem_clone_read(struct fastbuf *b) { - struct fastbuf *f = xmalloc(sizeof(struct fastbuf)); + struct fastbuf *f = xmalloc_zero(sizeof(struct fastbuf)); struct memstream *s = b->lldata; bflush(b); s->uc++; - f->bptr = f->bstop = f->buffer = f->bufend = NULL; - f->pos = f->fdpos = 0; f->name = ""; f->lldata = s; - f->llpos = NULL; f->refill = fbmem_refill; - f->spout = NULL; f->seek = fbmem_seek; f->close = fbmem_close; return f; -- 2.39.2