summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2010-07-01 18:37:58 +0200
committerTor Andersson <tor@ghostscript.com>2010-07-01 18:37:58 +0200
commit7f940ad522ceb63bc5d54923a1635773ca592b9b (patch)
tree821dc156af8475839694b2e1e0f903ad266e2a00
parent7e33ccb69be3c45fa5ca38c89870825b8e0165d9 (diff)
downloadmupdf-7f940ad522ceb63bc5d54923a1635773ca592b9b.tar.xz
Fix uninitialized reads.
-rw-r--r--mupdf/pdf_shade.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/mupdf/pdf_shade.c b/mupdf/pdf_shade.c
index ce43b23d..e7ba8749 100644
--- a/mupdf/pdf_shade.c
+++ b/mupdf/pdf_shade.c
@@ -773,6 +773,8 @@ pdf_loadtype4shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_logshade("load type4 (free-form triangle mesh) shading\n");
+ pdf_loadmeshparams(xref, dict, &p);
+
if (funcs > 0)
{
ncomp = 1;
@@ -783,8 +785,6 @@ pdf_loadtype4shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
else
ncomp = shade->cs->n;
- pdf_loadmeshparams(xref, dict, &p);
-
while (fz_peekbyte(stream) != EOF)
{
flag = readbits(stream, p.bpflag);
@@ -844,6 +844,8 @@ pdf_loadtype5shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_logshade("load type5 (lattice-form triangle mesh) shading\n");
+ pdf_loadmeshparams(xref, dict, &p);
+
if (funcs > 0)
{
ncomp = 1;
@@ -854,8 +856,6 @@ pdf_loadtype5shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
else
ncomp = shade->cs->n;
- pdf_loadmeshparams(xref, dict, &p);
-
ref = fz_malloc(p.vprow * sizeof(struct vertex));
buf = fz_malloc(p.vprow * sizeof(struct vertex));
first = 1;
@@ -903,6 +903,8 @@ pdf_loadtype6shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_logshade("load type6 (coons patch mesh) shading\n");
+ pdf_loadmeshparams(xref, dict, &p);
+
if (funcs > 0)
{
ncomp = 1;
@@ -913,8 +915,6 @@ pdf_loadtype6shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
else
ncomp = shade->cs->n;
- pdf_loadmeshparams(xref, dict, &p);
-
hasprevpatch = 0;
while (fz_peekbyte(stream) != EOF)
@@ -1028,6 +1028,8 @@ pdf_loadtype7shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_logshade("load type7 (tensor-product patch mesh) shading\n");
+ pdf_loadmeshparams(xref, dict, &p);
+
if (funcs > 0)
{
ncomp = 1;
@@ -1038,8 +1040,6 @@ pdf_loadtype7shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
else
ncomp = shade->cs->n;
- pdf_loadmeshparams(xref, dict, &p);
-
hasprevpatch = 0;
while (fz_peekbyte(stream) != EOF)