39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From cf56972d371a0557f30d5de64b4b9d2e87c74a6a Mon Sep 17 00:00:00 2001
|
|
From: zhangnaru <zhangnaru@huawei.com>
|
|
Date: Sat, 25 Jul 2020 10:48:34 +0800
|
|
Subject: [PATCH] CVE-2020-15389
|
|
|
|
---
|
|
src/bin/jp2/opj_decompress.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
|
|
index 4b9583b..af1661e 100644
|
|
--- a/src/bin/jp2/opj_decompress.c
|
|
+++ b/src/bin/jp2/opj_decompress.c
|
|
@@ -1316,10 +1316,6 @@ static opj_image_t* upsample_image_components(opj_image_t* original)
|
|
int main(int argc, char **argv)
|
|
{
|
|
opj_decompress_parameters parameters; /* decompression parameters */
|
|
- opj_image_t* image = NULL;
|
|
- opj_stream_t *l_stream = NULL; /* Stream */
|
|
- opj_codec_t* l_codec = NULL; /* Handle to a decompressor */
|
|
- opj_codestream_index_t* cstr_index = NULL;
|
|
|
|
OPJ_INT32 num_images, imageno;
|
|
img_fol_t img_fol;
|
|
@@ -1393,6 +1389,10 @@ int main(int argc, char **argv)
|
|
|
|
/*Decoding image one by one*/
|
|
for (imageno = 0; imageno < num_images ; imageno++) {
|
|
+ opj_image_t* image = NULL;
|
|
+ opj_stream_t *l_stream = NULL; /* stream */
|
|
+ opj_codec_t* l_codec = NULL; /* Handle to a decompressor */
|
|
+ opj_codestream_index_t* cstr_index = NULL;
|
|
|
|
if (!parameters.quiet) {
|
|
fprintf(stderr, "\n");
|
|
--
|
|
2.23.0
|
|
|