walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] WIP: resolve heap corruption with p0_07.j2k (credit to Winfried)

This commit is contained in:
Mickael Savinaud 2011-10-12 14:44:46 +00:00
parent 27e255fa75
commit 2d39e5d7a5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added + : added
October 12, 2011 October 12, 2011
* [mickael] WIP: resolve heap corruption with p0_07.j2k (credit to Winfried)
* [mickael] WIP: correct some memory leaks in applications functions * [mickael] WIP: correct some memory leaks in applications functions
+ [mickael] WIP: add a read CBD marker function (JPEG2000 part 2) + [mickael] WIP: add a read CBD marker function (JPEG2000 part 2)
+ [mickael] WIP: add a read MCO marker function (JPEG2000 part 2) + [mickael] WIP: add a read MCO marker function (JPEG2000 part 2)

4
libopenjpeg/pi.c
View File

@ -680,7 +680,7 @@ opj_pi_iterator_t *pi_create_decode_v2( opj_image_t *p_image,
l_current_pi = l_pi; l_current_pi = l_pi;
// memory allocation for include // memory allocation for include
l_current_pi->include = (OPJ_INT16*) opj_calloc(l_tcp->numlayers * l_step_l, sizeof(OPJ_INT16)); l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
if if
(!l_current_pi->include) (!l_current_pi->include)
{ {
@ -689,7 +689,7 @@ opj_pi_iterator_t *pi_create_decode_v2( opj_image_t *p_image,
pi_destroy_v2(l_pi, l_bound); pi_destroy_v2(l_pi, l_bound);
return 00; return 00;
} }
memset(l_current_pi->include,0,l_tcp->numlayers * l_step_l* sizeof(OPJ_INT16)); memset(l_current_pi->include,0, (l_tcp->numlayers + 1) * l_step_l* sizeof(OPJ_INT16));
// special treatment for the first packet iterator // special treatment for the first packet iterator
l_current_comp = l_current_pi->comps; l_current_comp = l_current_pi->comps;