summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/fitz/colorspace.c2
-rw-r--r--source/fitz/load-jpx.c2
-rw-r--r--source/fitz/output-png.c2
-rw-r--r--source/html/html-layout.c4
-rw-r--r--source/pdf/pdf-form.c2
-rw-r--r--source/pdf/pdf-outline.c3
-rw-r--r--source/pdf/pdf-xref.c3
7 files changed, 8 insertions, 10 deletions
diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index 2cb5c3d9..f4002d34 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -381,7 +381,7 @@ fz_get_icc_link(fz_context *ctx, fz_colorspace *src, fz_colorspace *prf, fz_colo
fz_iccprofile *src_icc = NULL;
fz_iccprofile *dst_icc = dst->data;
fz_iccprofile *prf_icc = NULL;
- fz_link_key *key;
+ fz_link_key *key = NULL;
fz_icclink *new_link;
if (prf != NULL)
diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
index 2859068c..4065b386 100644
--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
@@ -658,7 +658,7 @@ l2subfactor(fz_context *ctx, unsigned int max_w, unsigned int w)
static fz_pixmap *
jpx_read_image(fz_context *ctx, fz_jpxd *state, unsigned char *data, size_t size, fz_colorspace *defcs, int onlymeta)
{
- fz_pixmap *img;
+ fz_pixmap *img = NULL;
opj_dparameters_t params;
opj_codec_t *codec;
opj_image_t *jpx;
diff --git a/source/fitz/output-png.c b/source/fitz/output-png.c
index 0c0edf97..e86c82c9 100644
--- a/source/fitz/output-png.c
+++ b/source/fitz/output-png.c
@@ -306,7 +306,7 @@ static fz_buffer *
png_from_pixmap(fz_context *ctx, fz_pixmap *pix, const fz_color_params *color_params, int drop)
{
fz_buffer *buf = NULL;
- fz_output *out;
+ fz_output *out = NULL;
fz_pixmap *pix2 = NULL;
fz_var(buf);
diff --git a/source/html/html-layout.c b/source/html/html-layout.c
index cb101394..9aacf09b 100644
--- a/source/html/html-layout.c
+++ b/source/html/html-layout.c
@@ -2308,8 +2308,8 @@ load_fb2_images(fz_context *ctx, fz_xml *root)
for (binary = fz_xml_find_down(fictionbook, "binary"); binary; binary = fz_xml_find_next(binary, "binary"))
{
const char *id = fz_xml_att(binary, "id");
- char *b64;
- fz_buffer *buf;
+ char *b64 = NULL;
+ fz_buffer *buf = NULL;
fz_image *img;
fz_var(b64);
diff --git a/source/pdf/pdf-form.c b/source/pdf/pdf-form.c
index 417e74ac..b454420c 100644
--- a/source/pdf/pdf-form.c
+++ b/source/pdf/pdf-form.c
@@ -1400,7 +1400,7 @@ int pdf_signature_widget_contents(fz_context *ctx, pdf_document *doc, pdf_widget
void pdf_signature_set_value(fz_context *ctx, pdf_document *doc, pdf_obj *field, pdf_signer *signer)
{
- pdf_obj *v;
+ pdf_obj *v = NULL;
pdf_obj *indv;
int vnum;
pdf_obj *byte_range;
diff --git a/source/pdf/pdf-outline.c b/source/pdf/pdf-outline.c
index 7a774a13..2d184dd4 100644
--- a/source/pdf/pdf-outline.c
+++ b/source/pdf/pdf-outline.c
@@ -4,7 +4,7 @@
static fz_outline *
pdf_load_outline_imp(fz_context *ctx, pdf_document *doc, pdf_obj *dict)
{
- fz_outline *node, **prev, *first;
+ fz_outline *node, **prev, *first = NULL;
pdf_obj *obj;
pdf_obj *odict = dict;
@@ -13,7 +13,6 @@ pdf_load_outline_imp(fz_context *ctx, pdf_document *doc, pdf_obj *dict)
fz_try(ctx)
{
- first = NULL;
prev = &first;
while (dict && pdf_is_dict(ctx, dict))
{
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
index 54821a25..3ce2cb01 100644
--- a/source/pdf/pdf-xref.c
+++ b/source/pdf/pdf-xref.c
@@ -2553,7 +2553,7 @@ pdf_obj *pdf_progressive_advance(fz_context *ctx, pdf_document *doc, int pagenum
{
pdf_lexbuf *buf = &doc->lexbuf.base;
int curr_pos;
- pdf_obj *page;
+ pdf_obj *page = NULL;
pdf_load_hinted_page(ctx, doc, pagenum);
@@ -2581,7 +2581,6 @@ pdf_obj *pdf_progressive_advance(fz_context *ctx, pdf_document *doc, int pagenum
do
{
int num;
- page = NULL;
eof = pdf_obj_read(ctx, doc, &doc->linear_pos, &num, &page);
pdf_drop_obj(ctx, page);
page = NULL;