diff options
author | Tor Andersson <tor@ghostscript.com> | 2009-11-20 21:29:56 +0100 |
---|---|---|
committer | Tor Andersson <tor@ghostscript.com> | 2009-11-20 21:29:56 +0100 |
commit | a16d9e0c25ed986c57c521aa87d87f6c343218a7 (patch) | |
tree | 9b0a38819ce69b9f1f9a187504224411d2dd8074 /fitz/stm_read.c | |
parent | 549dbe8e5563f9a228c8de35f07d0108e3adf74c (diff) | |
download | mupdf-a16d9e0c25ed986c57c521aa87d87f6c343218a7.tar.xz |
Malloc cannot return null. Clean up streams and filters.
Diffstat (limited to 'fitz/stm_read.c')
-rw-r--r-- | fitz/stm_read.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/fitz/stm_read.c b/fitz/stm_read.c index adb79908..1dfa4648 100644 --- a/fitz/stm_read.c +++ b/fitz/stm_read.c @@ -20,22 +20,9 @@ fz_readimp(fz_stream *stm) if (buf->eof) return fz_okay; - error = fz_rewindbuffer(buf); - if (error) - { - stm->dead = 1; - return fz_rethrow(error, "cannot rewind output buffer"); - } - + fz_rewindbuffer(buf); if (buf->ep - buf->wp == 0) - { - error = fz_growbuffer(buf); - if (error) - { - stm->dead = 1; - return fz_rethrow(error, "cannot grow output buffer"); - } - } + fz_growbuffer(buf); switch (stm->kind) { @@ -80,23 +67,9 @@ fz_readimp(fz_stream *stm) return 0; if (buf->rp > buf->bp) - { - error = fz_rewindbuffer(buf); - if (error) - { - stm->dead = 1; - return fz_rethrow(error, "cannot rewind buffer"); - } - } + fz_rewindbuffer(buf); else - { - error = fz_growbuffer(buf); - if (error) - { - stm->dead = 1; - return fz_rethrow(error, "cannot grow buffer"); - } - } + fz_growbuffer(buf); } else if (reason == fz_iodone) |