summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@gmail.com>2017-09-06 20:16:16 +0200
committerSebastian Rasmussen <sebras@gmail.com>2017-09-07 20:40:38 +0800
commita27d9903ec238af6e4c1c59de1e1dae817b4f028 (patch)
treeedab5a190abb4ee105d74e19cf5dc479fadf109a
parentb096bed7b44f187eaacd8d8ee5f53a67d4aedda2 (diff)
downloadmupdf-a27d9903ec238af6e4c1c59de1e1dae817b4f028.tar.xz
Initialize variables to appease clang scan-build.
-rw-r--r--source/cbz/muimg.c2
-rw-r--r--source/fitz/buffer.c2
-rw-r--r--source/fitz/colorspace.c2
-rw-r--r--source/fitz/document.c2
-rw-r--r--source/fitz/draw-device.c2
-rw-r--r--source/fitz/draw-glyph.c2
-rw-r--r--source/fitz/filter-basic.c10
-rw-r--r--source/fitz/font.c14
-rw-r--r--source/fitz/image.c4
-rw-r--r--source/fitz/load-jpx.c2
-rw-r--r--source/fitz/load-png.c2
-rw-r--r--source/fitz/load-pnm.c2
-rw-r--r--source/fitz/load-tiff.c2
-rw-r--r--source/fitz/output-png.c4
-rw-r--r--source/fitz/output.c2
-rw-r--r--source/fitz/stext-device.c4
-rw-r--r--source/fitz/store.c2
-rw-r--r--source/fitz/stream-open.c2
-rw-r--r--source/fitz/util.c36
-rw-r--r--source/html/css-parse.c2
-rw-r--r--source/html/html-doc.c2
-rw-r--r--source/html/html-layout.c4
-rw-r--r--source/pdf/pdf-annot.c2
-rw-r--r--source/pdf/pdf-appearance.c2
-rw-r--r--source/pdf/pdf-colorspace.c2
-rw-r--r--source/pdf/pdf-device.c2
-rw-r--r--source/pdf/pdf-js.c11
-rw-r--r--source/pdf/pdf-layer.c2
-rw-r--r--source/pdf/pdf-object.c2
-rw-r--r--source/pdf/pdf-op-buffer.c2
-rw-r--r--source/pdf/pdf-op-run.c2
-rw-r--r--source/pdf/pdf-page.c4
-rw-r--r--source/pdf/pdf-parse.c2
-rw-r--r--source/pdf/pdf-portfolio.c2
-rw-r--r--source/pdf/pdf-repair.c2
-rw-r--r--source/pdf/pdf-stream.c2
-rw-r--r--source/pdf/pdf-type3.c2
-rw-r--r--source/pdf/pdf-write.c2
-rw-r--r--source/pdf/pdf-xref.c6
-rw-r--r--source/svg/svg-doc.c6
-rw-r--r--source/tools/murun.c184
-rw-r--r--source/xps/xps-doc.c2
-rw-r--r--source/xps/xps-image.c4
-rw-r--r--source/xps/xps-outline.c6
-rw-r--r--source/xps/xps-resource.c2
-rw-r--r--source/xps/xps-zip.c2
46 files changed, 181 insertions, 180 deletions
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index 4cb8cc4a..147dbe12 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -115,7 +115,7 @@ img_open_document_with_stream(fz_context *ctx, fz_stream *stm)
{
fz_buffer *buffer = NULL;
fz_image *image = NULL;
- img_document *doc;
+ img_document *doc = NULL;
fz_var(buffer);
fz_var(image);
diff --git a/source/fitz/buffer.c b/source/fitz/buffer.c
index 49c35726..a43ff296 100644
--- a/source/fitz/buffer.c
+++ b/source/fitz/buffer.c
@@ -31,7 +31,7 @@ fz_new_buffer(fz_context *ctx, size_t size)
fz_buffer *
fz_new_buffer_from_data(fz_context *ctx, unsigned char *data, size_t size)
{
- fz_buffer *b;
+ fz_buffer *b = NULL;
fz_try(ctx)
{
diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index 99aee398..29ad18d3 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -3151,7 +3151,7 @@ int fz_colorspace_is_indexed(fz_context *ctx, const fz_colorspace *cs)
fz_colorspace *
fz_new_indexed_colorspace(fz_context *ctx, fz_colorspace *base, int high, unsigned char *lookup)
{
- fz_colorspace *cs;
+ fz_colorspace *cs = NULL;
struct indexed *idx;
idx = fz_malloc_struct(ctx, struct indexed);
diff --git a/source/fitz/document.c b/source/fitz/document.c
index c03012f2..0e511c05 100644
--- a/source/fitz/document.c
+++ b/source/fitz/document.c
@@ -144,7 +144,7 @@ fz_open_document(fz_context *ctx, const char *filename)
{
const fz_document_handler *handler;
fz_stream *file;
- fz_document *doc;
+ fz_document *doc = NULL;
if (filename == NULL)
fz_throw(ctx, FZ_ERROR_GENERIC, "no document to open");
diff --git a/source/fitz/draw-device.c b/source/fitz/draw-device.c
index ce825eca..3a5ae1db 100644
--- a/source/fitz/draw-device.c
+++ b/source/fitz/draw-device.c
@@ -2600,7 +2600,7 @@ fz_new_draw_device_with_options(fz_context *ctx, const fz_draw_options *opts, co
fz_rect bounds;
fz_irect ibounds;
fz_matrix transform;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_aa_context aa = *ctx->aa;
fz_set_rasterizer_graphics_aa_level(ctx, &aa, opts->graphics);
diff --git a/source/fitz/draw-glyph.c b/source/fitz/draw-glyph.c
index 49ca6661..dacee540 100644
--- a/source/fitz/draw-glyph.c
+++ b/source/fitz/draw-glyph.c
@@ -413,7 +413,7 @@ unlock_and_return_val:
fz_pixmap *
fz_render_glyph_pixmap(fz_context *ctx, fz_font *font, int gid, fz_matrix *ctm, const fz_irect *scissor, int aa)
{
- fz_pixmap *val;
+ fz_pixmap *val = NULL;
unsigned char qe, qf;
fz_matrix subpix_ctm;
float size = fz_subpixel_adjust(ctx, ctm, &subpix_ctm, &qe, &qf);
diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c
index 8f3b18ac..5630c37b 100644
--- a/source/fitz/filter-basic.c
+++ b/source/fitz/filter-basic.c
@@ -58,7 +58,7 @@ close_null(fz_context *ctx, void *state_)
fz_stream *
fz_open_null(fz_context *ctx, fz_stream *chain, int len, fz_off_t offset)
{
- struct null_filter *state;
+ struct null_filter *state = NULL;
if (len < 0)
len = 0;
@@ -278,7 +278,7 @@ close_ahxd(fz_context *ctx, void *state_)
fz_stream *
fz_open_ahxd(fz_context *ctx, fz_stream *chain)
{
- fz_ahxd *state;
+ fz_ahxd *state = NULL;
fz_try(ctx)
{
@@ -422,7 +422,7 @@ close_a85d(fz_context *ctx, void *state_)
fz_stream *
fz_open_a85d(fz_context *ctx, fz_stream *chain)
{
- fz_a85d *state;
+ fz_a85d *state = NULL;
fz_try(ctx)
{
@@ -533,7 +533,7 @@ close_rld(fz_context *ctx, void *state_)
fz_stream *
fz_open_rld(fz_context *ctx, fz_stream *chain)
{
- fz_rld *state;
+ fz_rld *state = NULL;
fz_try(ctx)
{
@@ -596,7 +596,7 @@ close_arc4(fz_context *ctx, void *state_)
fz_stream *
fz_open_arc4(fz_context *ctx, fz_stream *chain, unsigned char *key, unsigned keylen)
{
- fz_arc4c *state;
+ fz_arc4c *state = NULL;
fz_try(ctx)
{
diff --git a/source/fitz/font.c b/source/fitz/font.c
index 38c9abab..9a113460 100644
--- a/source/fitz/font.c
+++ b/source/fitz/font.c
@@ -590,7 +590,7 @@ fz_font *
fz_new_font_from_memory(fz_context *ctx, const char *name, const unsigned char *data, int len, int index, int use_glyph_bbox)
{
fz_buffer *buffer = fz_new_buffer_from_shared_data(ctx, data, len);
- fz_font *font;
+ fz_font *font = NULL;
fz_try(ctx)
font = fz_new_font_from_buffer(ctx, name, buffer, index, use_glyph_bbox);
fz_always(ctx)
@@ -604,7 +604,7 @@ fz_font *
fz_new_font_from_file(fz_context *ctx, const char *name, const char *path, int index, int use_glyph_bbox)
{
fz_buffer *buffer = fz_read_file(ctx, path);
- fz_font *font;
+ fz_font *font = NULL;
fz_try(ctx)
font = fz_new_font_from_buffer(ctx, name, buffer, index, use_glyph_bbox);
fz_always(ctx)
@@ -764,7 +764,7 @@ fz_pixmap *
fz_render_ft_glyph_pixmap(fz_context *ctx, fz_font *font, int gid, const fz_matrix *trm, int aa)
{
FT_GlyphSlot slot = do_ft_render_glyph(ctx, font, gid, trm, aa);
- fz_pixmap *pixmap;
+ fz_pixmap *pixmap = NULL;
if (slot == NULL)
{
@@ -793,7 +793,7 @@ fz_glyph *
fz_render_ft_glyph(fz_context *ctx, fz_font *font, int gid, const fz_matrix *trm, int aa)
{
FT_GlyphSlot slot = do_ft_render_glyph(ctx, font, gid, trm, aa);
- fz_glyph *glyph;
+ fz_glyph *glyph = NULL;
if (slot == NULL)
{
@@ -917,7 +917,7 @@ fz_render_ft_stroked_glyph_pixmap(fz_context *ctx, fz_font *font, int gid, const
{
FT_Glyph glyph = do_render_ft_stroked_glyph(ctx, font, gid, trm, ctm, state, aa);
FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyph;
- fz_pixmap *pixmap;
+ fz_pixmap *pixmap = NULL;
if (bitmap == NULL)
{
@@ -947,7 +947,7 @@ fz_render_ft_stroked_glyph(fz_context *ctx, fz_font *font, int gid, const fz_mat
{
FT_Glyph glyph = do_render_ft_stroked_glyph(ctx, font, gid, trm, ctm, state, aa);
FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyph;
- fz_glyph *result;
+ fz_glyph *result = NULL;
if (bitmap == NULL)
{
@@ -1333,7 +1333,7 @@ fz_render_t3_glyph_pixmap(fz_context *ctx, fz_font *font, int gid, const fz_matr
fz_irect bbox;
fz_device *dev = NULL;
fz_pixmap *glyph;
- fz_pixmap *result;
+ fz_pixmap *result = NULL;
if (gid < 0 || gid > 255)
return NULL;
diff --git a/source/fitz/image.c b/source/fitz/image.c
index 89798bf2..2716cf56 100644
--- a/source/fitz/image.c
+++ b/source/fitz/image.c
@@ -901,7 +901,7 @@ fz_new_image_from_buffer(fz_context *ctx, fz_buffer *buffer)
fz_colorspace *cspace;
size_t len = buffer->len;
unsigned char *buf = buffer->data;
- fz_image *image;
+ fz_image *image = NULL;
int type;
if (len < 8)
@@ -981,7 +981,7 @@ fz_image *
fz_new_image_from_file(fz_context *ctx, const char *path)
{
fz_buffer *buffer;
- fz_image *image;
+ fz_image *image = NULL;
buffer = fz_read_file(ctx, path);
fz_try(ctx)
diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
index dfe176cf..fb88498c 100644
--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
@@ -892,7 +892,7 @@ fz_pixmap *
fz_load_jpx(fz_context *ctx, unsigned char *data, size_t size, fz_colorspace *defcs)
{
fz_jpxd state = { 0 };
- fz_pixmap *pix;
+ fz_pixmap *pix = NULL;
fz_try(ctx)
{
diff --git a/source/fitz/load-png.c b/source/fitz/load-png.c
index eabcf2d6..8f204015 100644
--- a/source/fitz/load-png.c
+++ b/source/fitz/load-png.c
@@ -559,7 +559,7 @@ png_mask_transparency(struct info *info, fz_pixmap *dst)
fz_pixmap *
fz_load_png(fz_context *ctx, unsigned char *p, size_t total)
{
- fz_pixmap *image;
+ fz_pixmap *image = NULL;
fz_colorspace *colorspace;
struct info png;
int stride;
diff --git a/source/fitz/load-pnm.c b/source/fitz/load-pnm.c
index 9e38dcbd..36493823 100644
--- a/source/fitz/load-pnm.c
+++ b/source/fitz/load-pnm.c
@@ -628,7 +628,7 @@ pnm_read_image(fz_context *ctx, struct info *pnm, unsigned char *p, size_t total
fz_pixmap *
fz_load_pnm(fz_context *ctx, unsigned char *p, size_t total)
{
- fz_pixmap *img;
+ fz_pixmap *img = NULL;
struct info pnm = { 0 };
fz_try(ctx)
diff --git a/source/fitz/load-tiff.c b/source/fitz/load-tiff.c
index 77539876..76df053a 100644
--- a/source/fitz/load-tiff.c
+++ b/source/fitz/load-tiff.c
@@ -292,7 +292,7 @@ tiff_decode_data(fz_context *ctx, struct tiff *tiff, unsigned char *rp, unsigned
{
fz_stream *encstm = NULL;
fz_stream *stm = NULL;
- unsigned i, size;
+ unsigned i, size = 0;
unsigned char *reversed = NULL;
fz_stream *jpegtables = NULL;
int old_tiff;
diff --git a/source/fitz/output-png.c b/source/fitz/output-png.c
index b86ea648..afda42f3 100644
--- a/source/fitz/output-png.c
+++ b/source/fitz/output-png.c
@@ -89,7 +89,7 @@ png_write_icc(fz_context *ctx, png_band_writer *writer, const fz_colorspace *cs)
int size;
fz_buffer *buffer = fz_icc_data_from_icc_colorspace(ctx, cs);
unsigned char *data;
- unsigned char *chunk, *pos, *cdata;
+ unsigned char *pos, *cdata, *chunk = NULL;
uLong bound;
uLongf csize;
uLong long_size;
@@ -356,7 +356,7 @@ fz_buffer *
fz_new_buffer_from_image_as_png(fz_context *ctx, fz_image *image, const fz_color_params *color_params)
{
fz_pixmap *pix = fz_get_pixmap_from_image(ctx, image, NULL, NULL, NULL, NULL);
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
fz_try(ctx)
buf = png_from_pixmap(ctx, pix, color_params, 1);
diff --git a/source/fitz/output.c b/source/fitz/output.c
index 75872ab2..a0f7fdee 100644
--- a/source/fitz/output.c
+++ b/source/fitz/output.c
@@ -148,7 +148,7 @@ file_close(fz_context *ctx, void *opaque)
fz_output *
fz_new_output(fz_context *ctx, void *state, fz_output_write_fn *write, fz_output_close_fn *close)
{
- fz_output *out;
+ fz_output *out = NULL;
fz_try(ctx)
{
diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
index ba609228..6d7df972 100644
--- a/source/fitz/stext-device.c
+++ b/source/fitz/stext-device.c
@@ -38,7 +38,7 @@ fz_stext_page *
fz_new_stext_page(fz_context *ctx, const fz_rect *mediabox)
{
fz_pool *pool = fz_new_pool(ctx);
- fz_stext_page *page;
+ fz_stext_page *page = NULL;
fz_try(ctx)
{
page = fz_pool_alloc(ctx, pool, sizeof(*page));
@@ -588,7 +588,7 @@ fz_new_image_from_shade(fz_context *ctx, fz_shade *shade, fz_matrix *in_out_ctm,
{
fz_matrix ctm = *in_out_ctm;
fz_pixmap *pix;
- fz_image *img;
+ fz_image *img = NULL;
fz_rect bounds;
fz_irect bbox;
diff --git a/source/fitz/store.c b/source/fitz/store.c
index bf98c1aa..bb9426ba 100644
--- a/source/fitz/store.c
+++ b/source/fitz/store.c
@@ -447,7 +447,7 @@ fz_store_item(fz_context *ctx, void *key, void *val_, size_t itemsize, const fz_
* to check whether we have one there already. */
if (use_hash)
{
- fz_item *existing;
+ fz_item *existing = NULL;
fz_try(ctx)
{
diff --git a/source/fitz/stream-open.c b/source/fitz/stream-open.c
index 3fe58712..83990d52 100644
--- a/source/fitz/stream-open.c
+++ b/source/fitz/stream-open.c
@@ -16,7 +16,7 @@ fz_file_exists(fz_context *ctx, const char *path)
fz_stream *
fz_new_stream(fz_context *ctx, void *state, fz_stream_next_fn *next, fz_stream_close_fn *close)
{
- fz_stream *stm;
+ fz_stream *stm = NULL;
fz_try(ctx)
{
diff --git a/source/fitz/util.c b/source/fitz/util.c
index 5d75aaad..f7567edc 100644
--- a/source/fitz/util.c
+++ b/source/fitz/util.c
@@ -7,7 +7,7 @@ fz_new_display_list_from_page(fz_context *ctx, fz_page *page)
{
fz_display_list *list;
fz_rect bounds;
- fz_device *dev;
+ fz_device *dev = NULL;
list = fz_new_display_list(ctx, fz_bound_page(ctx, page, &bounds));
@@ -34,7 +34,7 @@ fz_display_list *
fz_new_display_list_from_page_number(fz_context *ctx, fz_document *doc, int number)
{
fz_page *page;
- fz_display_list *list;
+ fz_display_list *list = NULL;
page = fz_load_page(ctx, doc, number);
fz_try(ctx)
@@ -51,7 +51,7 @@ fz_new_display_list_from_page_contents(fz_context *ctx, fz_page *page)
{
fz_display_list *list;
fz_rect bounds;
- fz_device *dev;
+ fz_device *dev = NULL;
list = fz_new_display_list(ctx, fz_bound_page(ctx, page, &bounds));
@@ -79,7 +79,7 @@ fz_new_display_list_from_annot(fz_context *ctx, fz_annot *annot)
{
fz_display_list *list;
fz_rect bounds;
- fz_device *dev;
+ fz_device *dev = NULL;
list = fz_new_display_list(ctx, fz_bound_annot(ctx, annot, &bounds));
@@ -108,7 +108,7 @@ fz_new_pixmap_from_display_list(fz_context *ctx, fz_display_list *list, const fz
fz_rect rect;
fz_irect irect;
fz_pixmap *pix;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_bound_display_list(ctx, list, &rect);
fz_transform_rect(&rect, ctm);
@@ -145,7 +145,7 @@ fz_new_pixmap_from_page_contents(fz_context *ctx, fz_page *page, const fz_matrix
fz_rect rect;
fz_irect irect;
fz_pixmap *pix;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_bound_page(ctx, page, &rect);
fz_transform_rect(&rect, ctm);
@@ -182,7 +182,7 @@ fz_new_pixmap_from_annot(fz_context *ctx, fz_annot *annot, const fz_matrix *ctm,
fz_rect rect;
fz_irect irect;
fz_pixmap *pix;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_bound_annot(ctx, annot, &rect);
fz_transform_rect(&rect, ctm);
@@ -219,7 +219,7 @@ fz_new_pixmap_from_page(fz_context *ctx, fz_page *page, const fz_matrix *ctm, fz
fz_rect rect;
fz_irect irect;
fz_pixmap *pix;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_bound_page(ctx, page, &rect);
fz_transform_rect(&rect, ctm);
@@ -254,7 +254,7 @@ fz_pixmap *
fz_new_pixmap_from_page_number(fz_context *ctx, fz_document *doc, int number, const fz_matrix *ctm, fz_colorspace *cs, int alpha)
{
fz_page *page;
- fz_pixmap *pix;
+ fz_pixmap *pix = NULL;
page = fz_load_page(ctx, doc, number);
fz_try(ctx)
@@ -270,7 +270,7 @@ fz_stext_page *
fz_new_stext_page_from_display_list(fz_context *ctx, fz_display_list *list, const fz_stext_options *options)
{
fz_stext_page *text;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_rect mediabox;
if (list == NULL)
@@ -300,7 +300,7 @@ fz_stext_page *
fz_new_stext_page_from_page(fz_context *ctx, fz_page *page, const fz_stext_options *options)
{
fz_stext_page *text;
- fz_device *dev;
+ fz_device *dev = NULL;
fz_rect mediabox;
if (page == NULL)
@@ -330,7 +330,7 @@ fz_stext_page *
fz_new_stext_page_from_page_number(fz_context *ctx, fz_document *doc, int number, const fz_stext_options *options)
{
fz_page *page;
- fz_stext_page *text;
+ fz_stext_page *text = NULL;
page = fz_load_page(ctx, doc, number);
fz_try(ctx)
@@ -346,7 +346,7 @@ int
fz_search_display_list(fz_context *ctx, fz_display_list *list, const char *needle, fz_rect *hit_bbox, int hit_max)
{
fz_stext_page *text;
- int count;
+ int count = 0;
text = fz_new_stext_page_from_display_list(ctx, list, NULL);
fz_try(ctx)
@@ -362,7 +362,7 @@ int
fz_search_page(fz_context *ctx, fz_page *page, const char *needle, fz_rect *hit_bbox, int hit_max)
{
fz_stext_page *text;
- int count;
+ int count = 0;
text = fz_new_stext_page_from_page(ctx, page, NULL);
fz_try(ctx)
@@ -378,7 +378,7 @@ int
fz_search_page_number(fz_context *ctx, fz_document *doc, int number, const char *needle, fz_rect *hit_bbox, int hit_max)
{
fz_page *page;
- int count;
+ int count = 0;
page = fz_load_page(ctx, doc, number);
fz_try(ctx)
@@ -462,7 +462,7 @@ fz_buffer *
fz_new_buffer_from_display_list(fz_context *ctx, fz_display_list *list, const fz_rect *sel, int crlf, const fz_stext_options *options)
{
fz_stext_page *text;
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
text = fz_new_stext_page_from_display_list(ctx, list, options);
fz_try(ctx)
@@ -478,7 +478,7 @@ fz_buffer *
fz_new_buffer_from_page(fz_context *ctx, fz_page *page, const fz_rect *sel, int crlf, const fz_stext_options *options)
{
fz_stext_page *text;
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
text = fz_new_stext_page_from_page(ctx, page, options);
fz_try(ctx)
@@ -494,7 +494,7 @@ fz_buffer *
fz_new_buffer_from_page_number(fz_context *ctx, fz_document *doc, int number, const fz_rect *sel, int crlf, const fz_stext_options *options)
{
fz_page *page;
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
page = fz_load_page(ctx, doc, number);
fz_try(ctx)
diff --git a/source/html/css-parse.c b/source/html/css-parse.c
index 8dbc4dae..8242279c 100644
--- a/source/html/css-parse.c
+++ b/source/html/css-parse.c
@@ -27,7 +27,7 @@ FZ_NORETURN static void fz_css_error(struct lexbuf *buf, const char *msg)
fz_css *fz_new_css(fz_context *ctx)
{
fz_pool *pool = fz_new_pool(ctx);
- fz_css *css;
+ fz_css *css = NULL;
fz_try(ctx)
{
diff --git a/source/html/html-doc.c b/source/html/html-doc.c
index 566aeac6..8cfa233f 100644
--- a/source/html/html-doc.c
+++ b/source/html/html-doc.c
@@ -171,7 +171,7 @@ static fz_document *
htdoc_open_document(fz_context *ctx, const char *filename)
{
char dirname[2048];
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
html_document *doc;
fz_dirname(dirname, filename, sizeof dirname);
diff --git a/source/html/html-layout.c b/source/html/html-layout.c
index fe9fbf22..e5e4f597 100644
--- a/source/html/html-layout.c
+++ b/source/html/html-layout.c
@@ -2311,7 +2311,7 @@ load_fb2_images(fz_context *ctx, fz_xml *root)
const char *id = fz_xml_att(binary, "id");
char *b64 = NULL;
fz_buffer *buf = NULL;
- fz_image *img;
+ fz_image *img = NULL;
fz_var(b64);
fz_var(buf);
@@ -2673,7 +2673,7 @@ fz_html *
fz_parse_html(fz_context *ctx, fz_html_font_set *set, fz_archive *zip, const char *base_uri, fz_buffer *buf, const char *user_css)
{
fz_xml *xml;
- fz_html *html;
+ fz_html *html = NULL;
fz_css_match match;
struct genstate g;
diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
index 43436f22..56681424 100644
--- a/source/pdf/pdf-annot.c
+++ b/source/pdf/pdf-annot.c
@@ -245,7 +245,7 @@ pdf_load_link(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int pagenum, co
pdf_obj *obj;
fz_rect bbox;
char *uri;
- fz_link *link;
+ fz_link *link = NULL;
obj = pdf_dict_get(ctx, dict, PDF_NAME_Subtype);
if (!pdf_name_eq(ctx, obj, PDF_NAME_Link))
diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c
index c5e35d5a..db99adae 100644
--- a/source/pdf/pdf-appearance.c
+++ b/source/pdf/pdf-appearance.c
@@ -1427,7 +1427,7 @@ void pdf_update_combobox_appearance(fz_context *ctx, pdf_document *doc, pdf_obj
void pdf_update_pushbutton_appearance(fz_context *ctx, pdf_document *doc, pdf_obj *obj)
{
- fz_rect rect;
+ fz_rect rect = fz_empty_rect;
pdf_xobject *form = NULL;
fz_buffer *fzbuf = NULL;
pdf_obj *tobj = NULL;
diff --git a/source/pdf/pdf-colorspace.c b/source/pdf/pdf-colorspace.c
index 9783d65a..4f910de3 100644
--- a/source/pdf/pdf-colorspace.c
+++ b/source/pdf/pdf-colorspace.c
@@ -166,7 +166,7 @@ base_devicen(const fz_colorspace *cs)
static fz_colorspace *
load_devicen(fz_context *ctx, pdf_obj *array)
{
- fz_colorspace *cs;
+ fz_colorspace *cs = NULL;
struct devicen *devn = NULL;
pdf_obj *nameobj = pdf_array_get(ctx, array, 1);
pdf_obj *baseobj = pdf_array_get(ctx, array, 2);
diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c
index 34aab893..a647702e 100644
--- a/source/pdf/pdf-device.c
+++ b/source/pdf/pdf-device.c
@@ -534,7 +534,7 @@ pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, const fz
{
pdf_document *doc = pdev->doc;
int num;
- pdf_obj *group_ref;
+ pdf_obj *group_ref = NULL;
pdf_obj *group;
pdf_obj *form;
diff --git a/source/pdf/pdf-js.c b/source/pdf/pdf-js.c
index aae1ac79..5b1fb670 100644
--- a/source/pdf/pdf-js.c
+++ b/source/pdf/pdf-js.c
@@ -91,6 +91,7 @@ static void app_alert(js_State *J)
event.icon_type = js_tointeger(J, 2);
event.button_group_type = js_tointeger(J, 3);
event.title = js_tostring(J, 4);
+ event.button_pressed = 0; /* WIP WIP WIP IS THIS CORRECT? */
fz_try(js->ctx)
pdf_event_issue_alert(js->ctx, js->doc, &event);
@@ -161,7 +162,7 @@ static void field_getName(js_State *J)
{
pdf_js *js = js_getcontext(J);
pdf_obj *field = js_touserdata(J, 0, "Field");
- char *name;
+ char *name = NULL;
fz_try(js->ctx)
name = pdf_field_name(js->ctx, js->doc, field);
fz_catch(js->ctx)
@@ -179,7 +180,7 @@ static void field_getDisplay(js_State *J)
{
pdf_js *js = js_getcontext(J);
pdf_obj *field = js_touserdata(J, 0, "Field");
- int display;
+ int display = 0;
fz_try(js->ctx)
display = pdf_field_display(js->ctx, js->doc, field);
fz_catch(js->ctx)
@@ -279,7 +280,7 @@ static void field_getBorderStyle(js_State *J)
{
pdf_js *js = js_getcontext(J);
pdf_obj *field = js_touserdata(J, 0, "Field");
- const char *border_style;
+ const char *border_style = NULL;
fz_try(js->ctx)
border_style = pdf_field_border_style(js->ctx, js->doc, field);
fz_catch(js->ctx)
@@ -302,7 +303,7 @@ static void field_getValue(js_State *J)
{
pdf_js *js = js_getcontext(J);
pdf_obj *field = js_touserdata(J, 0, "Field");
- char *val;
+ char *val = NULL;
fz_try(js->ctx)
val = pdf_field_value(js->ctx, js->doc, field);
@@ -383,7 +384,7 @@ static void doc_getField(js_State *J)
fz_context *ctx = js->ctx;
const char *cName = js_tostring(J, 1);
char *name = pdf_from_utf8(ctx, cName);
- pdf_obj *dict;
+ pdf_obj *dict = NULL;
fz_try(ctx)
dict = pdf_lookup_field(ctx, js->form, name);
diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
index d7f8df4f..acbe6b9a 100644
--- a/source/pdf/pdf-layer.c
+++ b/source/pdf/pdf-layer.c
@@ -617,7 +617,7 @@ pdf_is_hidden_ocg(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *rdb, const
{
/* An Optional Content Membership Dictionary */
pdf_obj *name;
- int combine, on;
+ int combine, on = 0;
obj = pdf_dict_get(ctx, ocg, PDF_NAME_VE);
if (pdf_is_array(ctx, obj)) {
diff --git a/source/pdf/pdf-object.c b/source/pdf/pdf-object.c
index d6c7d8e3..c490bb69 100644
--- a/source/pdf/pdf-object.c
+++ b/source/pdf/pdf-object.c
@@ -1801,7 +1801,7 @@ int pdf_obj_parent_num(fz_context *ctx, pdf_obj *obj)
pdf_obj *pdf_new_obj_from_str(fz_context *ctx, pdf_document *doc, const char *src)
{
- pdf_obj *result;
+ pdf_obj *result = NULL;
pdf_lexbuf lexbuf;
fz_stream *stream = fz_open_memory(ctx, (unsigned char *)src, strlen(src));
diff --git a/source/pdf/pdf-op-buffer.c b/source/pdf/pdf-op-buffer.c
index 6974fb00..6382d71e 100644
--- a/source/pdf/pdf-op-buffer.c
+++ b/source/pdf/pdf-op-buffer.c
@@ -928,7 +928,7 @@ pdf_new_output_processor(fz_context *ctx, fz_output *out, int ahxencode)
pdf_processor *
pdf_new_buffer_processor(fz_context *ctx, fz_buffer *buffer, int ahxencode)
{
- pdf_processor *proc;
+ pdf_processor *proc = NULL;
fz_output *out = fz_new_output_with_buffer(ctx, buffer);
fz_try(ctx)
{
diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
index f088139e..324ee32d 100644
--- a/source/pdf/pdf-op-run.c
+++ b/source/pdf/pdf-op-run.c
@@ -1218,7 +1218,7 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_xobject *xobj, pdf
pdf_obj *resources;
fz_rect xobj_bbox;
fz_matrix xobj_matrix;
- int transparency;
+ int transparency = 0;
pdf_document *doc;
fz_colorspace *cs = NULL;
diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c
index cb60634c..5b319e3a 100644
--- a/source/pdf/pdf-page.c
+++ b/source/pdf/pdf-page.c
@@ -312,7 +312,7 @@ pdf_lookup_page_number(fz_context *ctx, pdf_document *doc, pdf_obj *page)
int
pdf_lookup_anchor(fz_context *ctx, pdf_document *doc, const char *name, float *xp, float *yp)
{
- pdf_obj *needle, *dest;
+ pdf_obj *needle, *dest = NULL;
char *uri;
if (xp) *xp = 0;
@@ -342,7 +342,7 @@ static pdf_obj *
pdf_lookup_inherited_page_item(fz_context *ctx, pdf_obj *node, pdf_obj *key)
{
pdf_obj *node2 = node;
- pdf_obj *val;
+ pdf_obj *val = NULL;
/* fz_var(node); Not required as node passed in */
diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
index 084ffc19..e4715a26 100644
--- a/source/pdf/pdf-parse.c
+++ b/source/pdf/pdf-parse.c
@@ -186,7 +186,7 @@ pdf_load_stream_as_utf8(fz_context *ctx, pdf_obj *src)
fz_buffer *stmbuf;
unsigned char *srcptr;
size_t srclen;
- char *dst;
+ char *dst = NULL;
stmbuf = pdf_load_stream(ctx, src);
srclen = fz_buffer_storage(ctx, stmbuf, &srcptr);
diff --git a/source/pdf/pdf-portfolio.c b/source/pdf/pdf-portfolio.c
index 896aff61..08dc1b61 100644
--- a/source/pdf/pdf-portfolio.c
+++ b/source/pdf/pdf-portfolio.c
@@ -614,7 +614,7 @@ int pdf_add_portfolio_entry(fz_context *ctx, pdf_document *doc,
const char *filename, int filename_len,
const char *unifile, int unifile_len, fz_buffer *buf)
{
- int entry, len;
+ int len, entry = 0;
pdf_obj *ef, *f, *params, *s;
pdf_obj *key;
pdf_obj *val = NULL;
diff --git a/source/pdf/pdf-repair.c b/source/pdf/pdf-repair.c
index 91bbca1a..4e8b4bdf 100644
--- a/source/pdf/pdf-repair.c
+++ b/source/pdf/pdf-repair.c
@@ -52,7 +52,7 @@ pdf_repair_obj(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf, fz_off_t *st
if (tok == PDF_TOK_OPEN_DICT)
{
- pdf_obj *dict, *obj;
+ pdf_obj *obj, *dict = NULL;
fz_try(ctx)
{
diff --git a/source/pdf/pdf-stream.c b/source/pdf/pdf-stream.c
index 3650bd66..2cb54183 100644
--- a/source/pdf/pdf-stream.c
+++ b/source/pdf/pdf-stream.c
@@ -443,7 +443,7 @@ pdf_load_raw_stream_number(fz_context *ctx, pdf_document *doc, int num)
fz_stream *stm;
pdf_obj *dict;
int len;
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
pdf_xref_entry *x;
if (num > 0 && num < pdf_xref_len(ctx, doc))
diff --git a/source/pdf/pdf-type3.c b/source/pdf/pdf-type3.c
index 9701cf54..074e3c36 100644
--- a/source/pdf/pdf-type3.c
+++ b/source/pdf/pdf-type3.c
@@ -30,7 +30,7 @@ pdf_load_type3_font(fz_context *ctx, pdf_document *doc, pdf_obj *rdb, pdf_obj *d
int i, k, n;
fz_rect bbox;
fz_matrix matrix;
- fz_font *font;
+ fz_font *font = NULL;
fz_var(fontdesc);
diff --git a/source/pdf/pdf-write.c b/source/pdf/pdf-write.c
index d2ad560c..27ff94d6 100644
--- a/source/pdf/pdf-write.c
+++ b/source/pdf/pdf-write.c
@@ -648,7 +648,7 @@ static void removeduplicateobjs(fz_context *ctx, pdf_document *doc, pdf_write_st
for (other = 1; other < num; other++)
{
pdf_obj *a, *b;
- int differ, newnum, streama, streamb;
+ int newnum, streama = 0, streamb = 0, differ = 0;
if (num == other || !opts->use_list[num] || !opts->use_list[other])
continue;
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
index cba27397..0f3f56b1 100644
--- a/source/pdf/pdf-xref.c
+++ b/source/pdf/pdf-xref.c
@@ -676,7 +676,7 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b
fz_off_t t;
pdf_token tok;
int c;
- int size;
+ int size = 0;
fz_off_t ofs;
pdf_obj *trailer = NULL;
size_t n;
@@ -969,7 +969,7 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
pdf_obj *trailer = NULL;
pdf_obj *index = NULL;
pdf_obj *obj = NULL;
- int num, gen;
+ int gen, num = 0;
fz_off_t ofs, stm_ofs;
int size, w0, w1, w2;
int t;
@@ -2663,7 +2663,7 @@ pdf_add_object(fz_context *ctx, pdf_document *doc, pdf_obj *obj)
pdf_obj *
pdf_add_object_drop(fz_context *ctx, pdf_document *doc, pdf_obj *obj)
{
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_object(ctx, doc, obj);
fz_always(ctx)
diff --git a/source/svg/svg-doc.c b/source/svg/svg-doc.c
index 2a9f061e..d89093a3 100644
--- a/source/svg/svg-doc.c
+++ b/source/svg/svg-doc.c
@@ -108,7 +108,7 @@ static fz_document *
svg_open_document_with_stream(fz_context *ctx, fz_stream *file)
{
fz_buffer *buf;
- fz_document *doc;
+ fz_document *doc = NULL;
buf = fz_read_all(ctx, file, 0);
fz_try(ctx)
@@ -126,7 +126,7 @@ fz_display_list *
fz_new_display_list_from_svg(fz_context *ctx, fz_buffer *buf, float *w, float *h)
{
fz_document *doc;
- fz_display_list *list;
+ fz_display_list *list = NULL;
doc = svg_open_document_with_buffer(ctx, buf);
fz_try(ctx)
@@ -147,7 +147,7 @@ fz_image *
fz_new_image_from_svg(fz_context *ctx, fz_buffer *buf)
{
fz_display_list *list;
- fz_image *image;
+ fz_image *image = NULL;
float w, h;
list = fz_new_display_list_from_svg(ctx, buf, &w, &h);
diff --git a/source/tools/murun.c b/source/tools/murun.c
index caff0e64..3b76437b 100644
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -756,7 +756,7 @@ static void ffi_pushbuffer(js_State *J, fz_buffer *buf)
static fz_buffer *ffi_tobuffer(js_State *J, int idx)
{
fz_context *ctx = js_getcontext(J);
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
if (js_isuserdata(J, idx, "fz_buffer"))
buf = fz_keep_buffer(ctx, js_touserdata(J, idx, "fz_buffer"));
@@ -1453,7 +1453,7 @@ static void ffi_readFile(js_State *J)
{
fz_context *ctx = js_getcontext(J);
const char *filename = js_tostring(J, 1);
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
fz_try(ctx)
buf = fz_read_file(ctx, filename);
fz_catch(ctx)
@@ -1477,7 +1477,7 @@ static void ffi_new_Buffer(js_State *J)
{
fz_context *ctx = js_getcontext(J);
int n = js_isdefined(J, 1) ? js_tonumber(J, 1) : 0;
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
fz_try(ctx)
buf = fz_new_buffer(ctx, n);
fz_catch(ctx)
@@ -1561,7 +1561,7 @@ static void ffi_new_Document(js_State *J)
{
fz_context *ctx = js_getcontext(J);
const char *filename = js_tostring(J, 1);
- fz_document *doc;
+ fz_document *doc = NULL;
fz_try(ctx)
doc = fz_open_document(ctx, filename);
@@ -1580,7 +1580,7 @@ static void ffi_Document_countPages(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_document *doc = ffi_todocument(J, 0);
- int count;
+ int count = 0;
fz_try(ctx)
count = fz_count_pages(ctx, doc);
@@ -1595,7 +1595,7 @@ static void ffi_Document_loadPage(js_State *J)
fz_context *ctx = js_getcontext(J);
fz_document *doc = ffi_todocument(J, 0);
int number = js_tointeger(J, 1);
- fz_page *page;
+ fz_page *page = NULL;
fz_try(ctx)
page = fz_load_page(ctx, doc, number);
@@ -1609,7 +1609,7 @@ static void ffi_Document_needsPassword(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_document *doc = ffi_todocument(J, 0);
- int b;
+ int b = 0;
fz_try(ctx)
b = fz_needs_password(ctx, doc);
@@ -1624,7 +1624,7 @@ static void ffi_Document_authenticatePassword(js_State *J)
fz_context *ctx = js_getcontext(J);
fz_document *doc = ffi_todocument(J, 0);
const char *password = js_tostring(J, 1);
- int b;
+ int b = 0;
fz_try(ctx)
b = fz_authenticate_password(ctx, doc, password);
@@ -1653,7 +1653,7 @@ static void ffi_Document_isReflowable(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_document *doc = ffi_todocument(J, 0);
- int is_reflowable;
+ int is_reflowable = 0;
fz_try(ctx)
is_reflowable = fz_is_document_reflowable(ctx, doc);
@@ -1716,7 +1716,7 @@ static void ffi_Document_loadOutline(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_document *doc = ffi_todocument(J, 0);
- fz_outline *outline;
+ fz_outline *outline = NULL;
fz_try(ctx)
outline = fz_load_outline(ctx, doc);
@@ -1786,7 +1786,7 @@ static void ffi_Page_toDisplayList(js_State *J)
fz_context *ctx = js_getcontext(J);
fz_page *page = ffi_topage(J, 0);
int no_annots = js_isdefined(J, 1) ? js_toboolean(J, 1) : 0;
- fz_display_list *list;
+ fz_display_list *list = NULL;
fz_try(ctx)
if (no_annots)
@@ -1808,7 +1808,7 @@ static void ffi_Page_toPixmap(js_State *J)
fz_colorspace *colorspace = js_touserdata(J, 2, "fz_colorspace");
int alpha = js_toboolean(J, 3);
int no_annots = js_isdefined(J, 4) ? js_toboolean(J, 4) : 0;
- fz_pixmap *pixmap;
+ fz_pixmap *pixmap = NULL;
fz_try(ctx)
if (no_annots)
@@ -1828,7 +1828,7 @@ static void ffi_Page_toStructuredText(js_State *J)
fz_page *page = ffi_topage(J, 0);
const char *options = js_iscoercible(J, 1) ? js_tostring(J, 1) : NULL;
fz_stext_options so;
- fz_stext_page *text;
+ fz_stext_page *text = NULL;
fz_try(ctx) {
fz_parse_stext_options(ctx, &so, options);
@@ -1847,7 +1847,7 @@ static void ffi_Page_search(js_State *J)
fz_page *page = ffi_topage(J, 0);
const char *needle = js_tostring(J, 1);
fz_rect hits[256];
- int i, n;
+ int i, n = 0;
fz_try(ctx)
n = fz_search_page(ctx, page, needle, hits, nelem(hits));
@@ -1865,7 +1865,7 @@ static void ffi_Page_getAnnotations(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_page *page = ffi_topage(J, 0);
- fz_annot *annot;
+ fz_annot *annot = NULL;
int i = 0;
js_newarray(J);
@@ -1890,7 +1890,7 @@ static void ffi_Page_getLinks(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_page *page = ffi_topage(J, 0);
- fz_link *links, *link;
+ fz_link *link, *links = NULL;
int i = 0;
js_newarray(J);
@@ -1966,7 +1966,7 @@ static void ffi_Annotation_toDisplayList(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_annot *annot = ffi_toannot(J, 0);
- fz_display_list *list;
+ fz_display_list *list = NULL;
fz_try(ctx)
list = fz_new_display_list_from_annot(ctx, annot);
@@ -1984,7 +1984,7 @@ static void ffi_Annotation_toPixmap(js_State *J)
fz_matrix ctm = ffi_tomatrix(J, 1);
fz_colorspace *colorspace = js_touserdata(J, 2, "fz_colorspace");
int alpha = js_toboolean(J, 3);
- fz_pixmap *pixmap;
+ fz_pixmap *pixmap = NULL;
fz_try(ctx)
pixmap = fz_new_pixmap_from_annot(ctx, annot, &ctm, colorspace, alpha);
@@ -2015,7 +2015,7 @@ static void ffi_new_Pixmap(js_State *J)
fz_colorspace *colorspace = js_touserdata(J, 1, "fz_colorspace");
fz_irect bounds = ffi_toirect(J, 2);
int alpha = js_toboolean(J, 3);
- fz_pixmap *pixmap;
+ fz_pixmap *pixmap = NULL;
fz_try(ctx)
pixmap = fz_new_pixmap_with_bbox(ctx, colorspace, &bounds, 0, alpha);
@@ -2303,7 +2303,7 @@ static void ffi_Font_advanceGlyph(js_State *J)
static void ffi_new_Text(js_State *J)
{
fz_context *ctx = js_getcontext(J);
- fz_text *text;
+ fz_text *text = NULL;
fz_try(ctx)
text = fz_new_text(ctx);
@@ -2384,7 +2384,7 @@ static void ffi_Text_showString(js_State *J)
static void ffi_new_Path(js_State *J)
{
fz_context *ctx = js_getcontext(J);
- fz_path *path;
+ fz_path *path = NULL;
fz_try(ctx)
path = fz_new_path(ctx);
@@ -2606,7 +2606,7 @@ static void ffi_new_DisplayList(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_rect mediabox = js_iscoercible(J, 1) ? ffi_torect(J, 1) : fz_empty_rect;
- fz_display_list *list;
+ fz_display_list *list = NULL;
fz_try(ctx)
list = fz_new_display_list(ctx, &mediabox);
@@ -2651,7 +2651,7 @@ static void ffi_DisplayList_toPixmap(js_State *J)
fz_matrix ctm = ffi_tomatrix(J, 1);
fz_colorspace *colorspace = js_touserdata(J, 2, "fz_colorspace");
int alpha = js_isdefined(J, 3) ? js_toboolean(J, 3) : 0;
- fz_pixmap *pixmap;
+ fz_pixmap *pixmap = NULL;
fz_try(ctx)
pixmap = fz_new_pixmap_from_display_list(ctx, list, &ctm, colorspace, alpha);
@@ -2668,7 +2668,7 @@ static void ffi_DisplayList_toStructuredText(js_State *J)
fz_display_list *list = js_touserdata(J, 0, "fz_display_list");
const char *options = js_iscoercible(J, 1) ? js_tostring(J, 1) : NULL;
fz_stext_options so;
- fz_stext_page *text;
+ fz_stext_page *text = NULL;
fz_try(ctx) {
fz_parse_stext_options(ctx, &so, options);
@@ -2687,7 +2687,7 @@ static void ffi_DisplayList_search(js_State *J)
fz_display_list *list = js_touserdata(J, 0, "fz_display_list");
const char *needle = js_tostring(J, 1);
fz_rect hits[256];
- int i, n;
+ int i, n = 0;
fz_try(ctx)
n = fz_search_display_list(ctx, list, needle, hits, nelem(hits));
@@ -2707,7 +2707,7 @@ static void ffi_StructuredText_search(js_State *J)
fz_stext_page *text = js_touserdata(J, 0, "fz_stext_page");
const char *needle = js_tostring(J, 1);
fz_rect hits[256];
- int i, n;
+ int i, n = 0;
fz_try(ctx)
n = fz_search_stext_page(ctx, text, needle, hits, nelem(hits));
@@ -2727,7 +2727,7 @@ static void ffi_StructuredText_highlight(js_State *J)
fz_stext_page *text = js_touserdata(J, 0, "fz_stext_page");
fz_rect rect = ffi_torect(J, 1);
fz_rect hits[256];
- int i, n;
+ int i, n = 0;
fz_try(ctx)
n = fz_highlight_selection(ctx, text, rect, hits, nelem(hits));
@@ -2746,7 +2746,7 @@ static void ffi_StructuredText_copy(js_State *J)
fz_context *ctx = js_getcontext(J);
fz_stext_page *text = js_touserdata(J, 0, "fz_stext_page");
fz_rect rect = ffi_torect(J, 1);
- char *s;
+ char *s = NULL;
fz_try(ctx)
s = fz_copy_selection(ctx, text, rect);
@@ -2765,7 +2765,7 @@ static void ffi_new_DisplayListDevice(js_State *J)
{
fz_context *ctx = js_getcontext(J);
fz_display_list *list = js_touserdata(J, 0, "fz_display_list");
- fz_device *device;
+ fz_device *device = NULL;
fz_try(ctx)
device = fz_new_list_device(ctx, list);
@@ -2781,7 +2781,7 @@ static void ffi_new_DrawDevice(js_State *J)
fz_context *ctx = js_getcontext(J);
fz_matrix transform = ffi_tomatrix(J, 1);
fz_pixmap *pixmap = js_touserdata(J, 2, "fz_pixmap");
- fz_device *device;
+ fz_device *device = NULL;
fz_try(ctx)
device = fz_new_draw_device(ctx, &transform, pixmap);
@@ -2798,7 +2798,7 @@ static void ffi_new_DocumentWriter(js_State *J)
const char *filename = js_tostring(J, 1);
const char *format = js_iscoercible(J, 2) ? js_tostring(J, 2) : NULL;
const char *options = js_iscoercible(J, 3) ? js_tostring(J, 3) : NULL;
- fz_document_writer *wri;
+ fz_document_writer *wri = NULL;
fz_try(ctx)
wri = fz_new_document_writer(ctx, filename, format, options);
@@ -2814,7 +2814,7 @@ static void ffi_DocumentWriter_beginPage(js_State *J)
fz_context *ctx = js_getcontext(J);
fz_document_writer *wri = js_touserdata(J, 0, "fz_document_writer");
fz_rect mediabox = ffi_torect(J, 1);
- fz_device *device;
+ fz_device *device = NULL;
fz_try(ctx)
device = fz_begin_page(ctx, wri, &mediabox);
@@ -2852,7 +2852,7 @@ static void ffi_DocumentWriter_close(js_State *J)
static pdf_obj *ffi_toobj(js_State *J, pdf_document *pdf, int idx)
{
fz_context *ctx = js_getcontext(J);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
/* make sure index is absolute */
if (idx < 0)
@@ -2954,8 +2954,8 @@ static void ffi_pushobj(js_State *J, pdf_obj *obj);
static int ffi_pdf_obj_has(js_State *J, void *obj, const char *key)
{
fz_context *ctx = js_getcontext(J);
- pdf_obj *val;
- int idx, len;
+ pdf_obj *val = NULL;
+ int idx, len = 0;
if (!strcmp(key, "length")) {
fz_try(ctx)
@@ -2987,7 +2987,7 @@ static int ffi_pdf_obj_has(js_State *J, void *obj, const char *key)
static int ffi_pdf_obj_put(js_State *J, void *obj, const char *key)
{
fz_context *ctx = js_getcontext(J);
- pdf_document *pdf;
+ pdf_document *pdf = NULL;
pdf_obj *val;
int idx;
@@ -3069,7 +3069,7 @@ static void ffi_PDFDocument_getTrailer(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- pdf_obj *trailer;
+ pdf_obj *trailer = NULL;
fz_try(ctx)
trailer = pdf_trailer(ctx, pdf);
@@ -3083,7 +3083,7 @@ static void ffi_PDFDocument_countObjects(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- int count;
+ int count = 0;
fz_try(ctx)
count = pdf_xref_len(ctx, pdf);
@@ -3097,7 +3097,7 @@ static void ffi_PDFDocument_createObject(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_new_indirect(ctx, pdf, pdf_create_object(ctx, pdf), 0);
@@ -3125,7 +3125,7 @@ static void ffi_PDFDocument_addObject(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
pdf_obj *obj = ffi_toobj(J, pdf, 1);
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_object_drop(ctx, pdf, obj);
@@ -3141,7 +3141,7 @@ static void ffi_PDFDocument_addStream_imp(js_State *J, int compressed)
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
fz_buffer *buf = ffi_tobuffer(J, 1); /* FIXME: leak if ffi_toobj throws */
pdf_obj *obj = js_iscoercible(J, 2) ? ffi_toobj(J, pdf, 2) : NULL;
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_stream(ctx, pdf, buf, obj, compressed);
@@ -3169,7 +3169,7 @@ static void ffi_PDFDocument_addImage(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
fz_image *image = js_touserdata(J, 1, "fz_image");
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_image(ctx, pdf, image, 0);
@@ -3184,7 +3184,7 @@ static void ffi_PDFDocument_addSimpleFont(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
fz_font *font = js_touserdata(J, 1, "fz_font");
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_simple_font(ctx, pdf, font);
@@ -3199,7 +3199,7 @@ static void ffi_PDFDocument_addFont(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
fz_font *font = js_touserdata(J, 1, "fz_font");
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_cid_font(ctx, pdf, font);
@@ -3217,7 +3217,7 @@ static void ffi_PDFDocument_addPage(js_State *J)
int rotate = js_tonumber(J, 2);
pdf_obj *resources = ffi_toobj(J, pdf, 3); /* FIXME: leak if ffi_tobuffer throws */
fz_buffer *contents = ffi_tobuffer(J, 4);
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_add_page(ctx, pdf, &mediabox, rotate, resources, contents);
@@ -3261,7 +3261,7 @@ static void ffi_PDFDocument_countPages(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- int count;
+ int count = 0;
fz_try(ctx)
count = pdf_count_pages(ctx, pdf);
@@ -3276,7 +3276,7 @@ static void ffi_PDFDocument_findPage(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
int at = js_tonumber(J, 1);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_lookup_page_obj(ctx, pdf, at);
@@ -3305,7 +3305,7 @@ static void ffi_PDFDocument_newNull(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_null(ctx, pdf);
fz_catch(ctx)
@@ -3318,7 +3318,7 @@ static void ffi_PDFDocument_newBoolean(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
int val = js_toboolean(J, 1);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_bool(ctx, pdf, val);
fz_catch(ctx)
@@ -3331,7 +3331,7 @@ static void ffi_PDFDocument_newInteger(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
int val = js_tointeger(J, 1);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_int(ctx, pdf, val);
fz_catch(ctx)
@@ -3344,7 +3344,7 @@ static void ffi_PDFDocument_newReal(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
float val = js_tonumber(J, 1);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_real(ctx, pdf, val);
fz_catch(ctx)
@@ -3359,7 +3359,7 @@ static void ffi_PDFDocument_newString(js_State *J)
// TODO: convert array of numbers to raw string
// TODO: convert to UCS-2 or PDFDocEncoding
const char *val = js_tostring(J, 1);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_string(ctx, pdf, val, strlen(val));
fz_catch(ctx)
@@ -3372,7 +3372,7 @@ static void ffi_PDFDocument_newName(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
const char *val = js_tostring(J, 1);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_name(ctx, pdf, val);
fz_catch(ctx)
@@ -3386,7 +3386,7 @@ static void ffi_PDFDocument_newIndirect(js_State *J)
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
int num = js_tointeger(J, 1);
int gen = js_tointeger(J, 2);
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_indirect(ctx, pdf, num, gen);
fz_catch(ctx)
@@ -3398,7 +3398,7 @@ static void ffi_PDFDocument_newArray(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_array(ctx, pdf, 0);
fz_catch(ctx)
@@ -3410,7 +3410,7 @@ static void ffi_PDFDocument_newDictionary(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- pdf_obj *obj;
+ pdf_obj *obj = NULL;
fz_try(ctx)
obj = pdf_new_dict(ctx, pdf, 0);
fz_catch(ctx)
@@ -3422,7 +3422,7 @@ static void ffi_PDFDocument_newGraftMap(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
- pdf_graft_map *map;
+ pdf_graft_map *map = NULL;
fz_try(ctx)
map = pdf_new_graft_map(ctx, pdf);
fz_catch(ctx)
@@ -3496,7 +3496,7 @@ static void ffi_PDFObject_resolve(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- pdf_obj *ind;
+ pdf_obj *ind = NULL;
fz_try(ctx)
ind = pdf_resolve_indirect(ctx, obj);
fz_catch(ctx)
@@ -3509,7 +3509,7 @@ static void ffi_PDFObject_toString(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
int tight = js_isdefined(J, 1) ? js_toboolean(J, 1) : 1;
- char *s;
+ char *s = NULL;
int n;
fz_var(s);
@@ -3552,7 +3552,7 @@ static void ffi_PDFObject_isArray(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_array(ctx, obj);
fz_catch(ctx)
@@ -3564,7 +3564,7 @@ static void ffi_PDFObject_isDictionary(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_dict(ctx, obj);
fz_catch(ctx)
@@ -3576,7 +3576,7 @@ static void ffi_PDFObject_isIndirect(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_indirect(ctx, obj);
fz_catch(ctx)
@@ -3588,7 +3588,7 @@ static void ffi_PDFObject_asIndirect(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int num;
+ int num = 0;
fz_try(ctx)
num = pdf_to_num(ctx, obj);
fz_catch(ctx)
@@ -3600,7 +3600,7 @@ static void ffi_PDFObject_isNull(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_null(ctx, obj);
fz_catch(ctx)
@@ -3612,7 +3612,7 @@ static void ffi_PDFObject_isBoolean(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_bool(ctx, obj);
fz_catch(ctx)
@@ -3624,7 +3624,7 @@ static void ffi_PDFObject_asBoolean(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_to_bool(ctx, obj);
fz_catch(ctx)
@@ -3636,7 +3636,7 @@ static void ffi_PDFObject_isNumber(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_number(ctx, obj);
fz_catch(ctx)
@@ -3648,7 +3648,7 @@ static void ffi_PDFObject_asNumber(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- float num;
+ float num = 0;
fz_try(ctx)
if (pdf_is_int(ctx, obj))
num = pdf_to_int(ctx, obj);
@@ -3663,7 +3663,7 @@ static void ffi_PDFObject_isName(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_name(ctx, obj);
fz_catch(ctx)
@@ -3675,7 +3675,7 @@ static void ffi_PDFObject_asName(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- const char *name;
+ const char *name = NULL;
fz_try(ctx)
name = pdf_to_name(ctx, obj);
fz_catch(ctx)
@@ -3687,7 +3687,7 @@ static void ffi_PDFObject_isString(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_string(ctx, obj);
fz_catch(ctx)
@@ -3699,7 +3699,7 @@ static void ffi_PDFObject_asString(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- char *string;
+ char *string = NULL;
fz_try(ctx)
string = pdf_to_utf8(ctx, obj);
@@ -3720,7 +3720,7 @@ static void ffi_PDFObject_asByteString(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
const char *buf;
- int i, len;
+ int i, len = 0;
fz_try(ctx) {
buf = pdf_to_str_buf(ctx, obj);
@@ -3739,7 +3739,7 @@ static void ffi_PDFObject_isStream(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- int b;
+ int b = 0;
fz_try(ctx)
b = pdf_is_stream(ctx, obj);
fz_catch(ctx)
@@ -3751,7 +3751,7 @@ static void ffi_PDFObject_readStream(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
fz_try(ctx)
buf = pdf_load_stream(ctx, obj);
fz_catch(ctx)
@@ -3763,7 +3763,7 @@ static void ffi_PDFObject_readRawStream(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- fz_buffer *buf;
+ fz_buffer *buf = NULL;
fz_try(ctx)
buf = pdf_load_raw_stream(ctx, obj);
fz_catch(ctx)
@@ -3815,9 +3815,9 @@ static void ffi_PDFObject_forEach(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_obj *obj = js_touserdata(J, 0, "pdf_obj");
- pdf_obj *val;
- const char *key;
- int i, n;
+ pdf_obj *val = NULL;
+ const char *key = NULL;
+ int i, n = 0;
fz_try(ctx)
obj = pdf_resolve_indirect_chain(ctx, obj);
@@ -3871,7 +3871,7 @@ static void ffi_PDFPage_createAnnotation(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_page *page = js_touserdata(J, 0, "pdf_page");
const char *name = js_tostring(J, 1);
- pdf_annot *annot;
+ pdf_annot *annot = NULL;
int subtype;
fz_try(ctx)
@@ -3900,7 +3900,7 @@ static void ffi_PDFAnnotation_getType(js_State *J)
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
int type;
- const char *subtype;
+ const char *subtype = NULL;
fz_try(ctx)
{
type = pdf_annot_type(ctx, annot);
@@ -3915,7 +3915,7 @@ static void ffi_PDFAnnotation_getFlags(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- int flags;
+ int flags = 0;
fz_try(ctx)
flags = pdf_annot_flags(ctx, annot);
fz_catch(ctx)
@@ -3938,7 +3938,7 @@ static void ffi_PDFAnnotation_getContents(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- const char *contents;
+ const char *contents = NULL;
fz_try(ctx)
contents = pdf_annot_contents(ctx, annot);
fz_catch(ctx)
@@ -3984,7 +3984,7 @@ static void ffi_PDFAnnotation_getBorder(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- float border;
+ float border = 0;
fz_try(ctx)
border = pdf_annot_border(ctx, annot);
fz_catch(ctx)
@@ -4007,7 +4007,7 @@ static void ffi_PDFAnnotation_getColor(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- int i, n;
+ int i, n = 0;
float color[4];
fz_try(ctx)
pdf_annot_color(ctx, annot, &n, color);
@@ -4041,7 +4041,7 @@ static void ffi_PDFAnnotation_getInteriorColor(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- int i, n;
+ int i, n = 0;
float color[4];
fz_try(ctx)
pdf_annot_interior_color(ctx, annot, &n, color);
@@ -4075,8 +4075,8 @@ static void ffi_PDFAnnotation_getQuadPoints(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- float qp[8];
- int i, k, n;
+ float qp[8] = { 0 };
+ int i, k, n = 0;
fz_try(ctx)
n = pdf_annot_quad_point_count(ctx, annot);
@@ -4102,8 +4102,8 @@ static void ffi_PDFAnnotation_setQuadPoints(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- float *qp;
- int n, k, i;
+ float *qp = NULL;
+ int k, i, n = 0;
n = js_getlength(J, 1);
@@ -4134,8 +4134,8 @@ static void ffi_PDFAnnotation_getInkList(js_State *J)
{
fz_context *ctx = js_getcontext(J);
pdf_annot *annot = js_touserdata(J, 0, "pdf_annot");
- int i, k, n, m;
- float v[2];
+ int i, k, m = 0, n = 0;
+ float v[2] = { 0 };
js_newarray(J);
diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c
index 611e5903..9be8dec1 100644
--- a/source/xps/xps-doc.c
+++ b/source/xps/xps-doc.c
@@ -329,7 +329,7 @@ static fz_xml *
xps_load_fixed_page(fz_context *ctx, xps_document *doc, xps_fixpage *page)
{
xps_part *part;
- fz_xml *root;
+ fz_xml *root = NULL;
char *width_att;
char *height_att;
diff --git a/source/xps/xps-image.c b/source/xps/xps-image.c
index c9870a01..82eee8e5 100644
--- a/source/xps/xps-image.c
+++ b/source/xps/xps-image.c
@@ -93,8 +93,8 @@ void
xps_parse_image_brush(fz_context *ctx, xps_document *doc, const fz_matrix *ctm, const fz_rect *area,
char *base_uri, xps_resource *dict, fz_xml *root)
{
- xps_part *part;
- fz_image *image;
+ xps_part *part = NULL;
+ fz_image *image = NULL;
fz_try(ctx)
{
diff --git a/source/xps/xps-outline.c b/source/xps/xps-outline.c
index 63b6326b..61736992 100644
--- a/source/xps/xps-outline.c
+++ b/source/xps/xps-outline.c
@@ -83,8 +83,8 @@ static fz_outline *
xps_load_document_structure(fz_context *ctx, xps_document *doc, xps_fixdoc *fixdoc)
{
xps_part *part;
- fz_xml *root;
- fz_outline *outline;
+ fz_xml *root = NULL;
+ fz_outline *outline = NULL;
part = xps_read_part(ctx, doc, fixdoc->outline);
fz_try(ctx)
@@ -123,7 +123,7 @@ xps_load_outline(fz_context *ctx, fz_document *doc_)
{
xps_document *doc = (xps_document*)doc_;
xps_fixdoc *fixdoc;
- fz_outline *head = NULL, *tail, *outline;
+ fz_outline *head = NULL, *tail, *outline = NULL;
for (fixdoc = doc->first_fixdoc; fixdoc; fixdoc = fixdoc->next)
{
diff --git a/source/xps/xps-resource.c b/source/xps/xps-resource.c
index 29ed864a..c2292e60 100644
--- a/source/xps/xps-resource.c
+++ b/source/xps/xps-resource.c
@@ -61,7 +61,7 @@ xps_parse_remote_resource_dictionary(fz_context *ctx, xps_document *doc, char *b
char part_uri[1024];
xps_resource *dict;
xps_part *part;
- fz_xml *xml;
+ fz_xml *xml = NULL;
char *s;
/* External resource dictionaries MUST NOT reference other resource dictionaries */
diff --git a/source/xps/xps-zip.c b/source/xps/xps-zip.c
index a17894ea..c528b94e 100644
--- a/source/xps/xps-zip.c
+++ b/source/xps/xps-zip.c
@@ -160,7 +160,7 @@ xps_open_document(fz_context *ctx, const char *filename)
char buf[2048];
fz_stream *file;
char *p;
- fz_document *doc;
+ fz_document *doc = NULL;
if (strstr(filename, "/_rels/.rels") || strstr(filename, "\\_rels\\.rels"))
{