Attachment 835145 Details for Bug 1037945 – patch 4

[patch] patch 4

null-ptr-deref.patch (text/plain), 1.14 KB, created by Murray McAllister on 2013-12-11 07:34:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murray McAllister

Created: 2013-12-11 07:34:50 UTC

Size: 1.14 KB

patch

obsolete

>Index: openjpeg-1.5.1/libopenjpeg/t2.c
>===================================================================
>--- openjpeg-1.5.1.orig/libopenjpeg/t2.c	2012-09-13 09:58:39.000000000 +0000
>+++ openjpeg-1.5.1/libopenjpeg/t2.c	2013-01-01 01:01:01.000000000 +0000
>@@ -340,6 +340,11 @@ static int t2_decode_packet(opj_t2_t* t2
> 	int precno = pi->precno;	/* precinct value */
> 	int layno  = pi->layno;		/* quality layer value */
> 
>+	if (!&(tile->comps[compno])) {
>+		opj_event_msg(t2->cinfo, EVT_ERROR, "Trying to decode tile with no components!\n");
>+		return -999;
>+	}
>+
> 	opj_tcd_resolution_t* res = &tile->comps[compno].resolutions[resno];
> 
> 	unsigned char *hd = NULL;
>Index: openjpeg-1.5.1/libopenjpeg/tcd.c
>===================================================================
>--- openjpeg-1.5.1.orig/libopenjpeg/tcd.c	2013-01-01 01:01:01.000000000 +0000
>+++ openjpeg-1.5.1/libopenjpeg/tcd.c	2013-01-01 01:01:01.000000000 +0000
>@@ -1381,6 +1381,7 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd,
> 	if (l == -999) {
> 		eof = 1;
> 		opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bistream\n");
>+		return false;
> 	}
> 	
> 	/*------------------TIER1-----------------*/

Actions: View | Diff

Attachments on bug 1037945: 835142 | 835143 | 835144 | 835145 | 835146 | 835147 | 835149 | 835150 | 835152