From 53471a76f1291ce607ee48bea158dbebe871ef3a Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Thu, 6 Sep 2007 16:49:15 +0000
Subject: [PATCH] ENH: Fix unitialized read in img_fol (we may need a smarter
 initialize than memset)

---
 ChangeLog            | 1 +
 codec/CMakeLists.txt | 2 +-
 codec/image_to_j2k.c | 3 +++
 codec/j2k_to_image.c | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0cdd7892..5aa3efda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ September 6, 2007
 + [Mathieu Malaterre] CMake: Add doxygen output
 + [GB] One more field in the codestream_info struct for recording the number of packets per tile part; JPWL now distributes the EPBs in all the tile part headers
 + [Mathieu Malaterre] CMake: Add very simple tests (simply run command line with no option)
+* [Mathieu Malaterre] Fix unitialized read in img_fol (we may need a smarter initialize than memset)
 
 September 4, 2007
 + [GB] Added some fields in the codestream_info structure: they are used to record the position of single tile parts. Changed also the write_index function in the codec, to reflect the presence of this new information.
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index a381840c..363c8fd8 100644
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -42,7 +42,7 @@ FIND_PACKAGE(TIFF REQUIRED)
 FOREACH(exe j2k_to_image image_to_j2k)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
   TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES})
-  ADD_TEST(${exe} ${exe})
+  ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
   # On unix you need to link to the math library:
   IF(UNIX)
     TARGET_LINK_LIBRARIES(${exe} m)
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index c921e215..cbb9d0bc 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -1745,6 +1745,9 @@ int main(int argc, char **argv) {
 	/* set encoding parameters to default values */
 	opj_set_default_encoder_parameters(&parameters);
 
+	/* need to initialize img_fol since parameters will be read in parse_cmdline_decoder */
+	memset(&img_fol,0,sizeof(img_fol_t));
+
 	/* parse input and get user encoding parameters */
 	if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp) == 1) {
 		return 0;
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index f0584554..ee774166 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -517,6 +517,8 @@ int main(int argc, char **argv) {
 	/* set decoding parameters to default values */
 	opj_set_default_decoder_parameters(&parameters);
 
+	/* need to initialize img_fol since parameters will be read in parse_cmdline_decoder */
+	memset(&img_fol,0,sizeof(img_fol_t));
 
 	/* parse input and get user encoding parameters */
 	if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol) == 1) {