From 313975debf51f34e58d8cbe5217ceb8c9619d4ee Mon Sep 17 00:00:00 2001 From: Francois-Olivier Devaux Date: Fri, 27 Aug 2004 14:22:33 +0000 Subject: [PATCH] Pointer values initialized to zero --- mj2/mj2.c | 10 ++++++---- mj2/mj2_to_frames.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mj2/mj2.c b/mj2/mj2.c index 3fbe5092..3312f83e 100644 --- a/mj2/mj2.c +++ b/mj2/mj2.c @@ -83,7 +83,7 @@ void mj2_memory_free(mj2_movie_t * movie) { int i; - mj2_tk_t *tk; + mj2_tk_t *tk=NULL; if (movie->num_cl != 0) free(movie->cl); @@ -567,7 +567,7 @@ int mj2_read_mdat(mj2_movie_t * movie, unsigned char *src, char *outfile) int track_nb; unsigned int i; int jp2c_cio_len, jp2c_len, pos_correction = 0; - FILE *f; + FILE *f=NULL; mj2_box_t box; @@ -638,6 +638,8 @@ int mj2_read_mdat(mj2_movie_t * movie, unsigned char *src, char *outfile) if (imagetoyuv(&img, &cp, tk->imagefile)) return 1; + j2k_dec_release(); + if (cio_tell() + 8 != jp2c_len) { fprintf(stderr, "Error with JP2C Box Size\n"); return 1; @@ -2843,8 +2845,8 @@ int mj2_read_moov(mj2_movie_t * movie, j2k_image_t * img) int mj2_encode(mj2_movie_t * movie, j2k_cp_t * cp, char *index) { - char *outbuf; - FILE *outfile; + char *outbuf=NULL; + FILE *outfile=NULL; int len; unsigned int i; diff --git a/mj2/mj2_to_frames.c b/mj2/mj2_to_frames.c index b5bca7a4..4c1d054d 100644 --- a/mj2/mj2_to_frames.c +++ b/mj2/mj2_to_frames.c @@ -39,9 +39,9 @@ int ceildiv(int a, int b) int main(int argc, char **argv) { - FILE *f; - char *src, *src_name; - char *dest, S1, S2, S3; + FILE *f=NULL; + char *src=NULL, *src_name=NULL; + char *dest=NULL, S1, S2, S3; int len; j2k_cp_t cp; mj2_movie_t mj2_movie;