summarylogtreecommitdiffstats
path: root/rhbz1037948_CVE-2013-6887.patch
blob: 87bf0dd230d35ca04cf0e33f2981d4d676f9fe18 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff -rupN openjpeg-1.5.2/libopenjpeg/j2k.c openjpeg-1.5.2-new/libopenjpeg/j2k.c
--- openjpeg-1.5.2/libopenjpeg/j2k.c	2014-03-27 11:58:08.000000000 +0100
+++ openjpeg-1.5.2-new/libopenjpeg/j2k.c	2014-04-03 23:50:50.678143002 +0200
@@ -1712,8 +1712,11 @@ static void j2k_read_eoc(opj_j2k_t *j2k)
 	else {
 		for (i = 0; i < j2k->cp->tileno_size; i++) {
 			tileno = j2k->cp->tileno[i];
-			opj_free(j2k->tile_data[tileno]);
-			j2k->tile_data[tileno] = NULL;
+			/* not sure if this can actually happen */
+			if (tileno != -1) {
+				opj_free(j2k->tile_data[tileno]);
+				j2k->tile_data[tileno] = NULL;
+			}
 		}
 	}	
 	if (j2k->state & J2K_STATE_ERR)