generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[trunk] Fix heap buffer overflow

Browse Source 
Enforce sanity checks on tile number and tile length, even when the (rather
broken) USE_JPWL code isn't enabled.
Import r1727 from branch 1.5
This commit is contained in:
Mathieu Malaterre 2012-07-10 13:09:45 +00:00
parent 79a0533c69
commit 178236cc5f
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libopenjpeg/j2k.c
View File

@ -5240,7 +5240,7 @@ static void j2k_read_sot(opj_j2k_t *j2k) {
static int backup_tileno = 0; static int backup_tileno = 0;
/* tileno is negative or larger than the number of tiles!!! */ /* tileno is negative or larger than the number of tiles!!! */
if ((tileno < 0) || (tileno > (cp->tw * cp->th))) { if ((tileno < 0) || (tileno >= (cp->tw * cp->th))) {
opj_event_msg(j2k->cinfo, EVT_ERROR, opj_event_msg(j2k->cinfo, EVT_ERROR,
"JPWL: bad tile number (%d out of a maximum of %d)\n", "JPWL: bad tile number (%d out of a maximum of %d)\n",
tileno, (cp->tw * cp->th)); tileno, (cp->tw * cp->th));
@ -5257,8 +5257,18 @@ static void j2k_read_sot(opj_j2k_t *j2k) {
/* keep your private count of tiles */ /* keep your private count of tiles */
backup_tileno++; backup_tileno++;
}; }
else
#endif /* USE_JPWL */ #endif /* USE_JPWL */
{
/* tileno is negative or larger than the number of tiles!!! */
if ((tileno < 0) || (tileno >= (cp->tw * cp->th))) {
opj_event_msg(j2k->cinfo, EVT_ERROR,
"JPWL: bad tile number (%d out of a maximum of %d)\n",
tileno, (cp->tw * cp->th));
return;
}
}
if (cp->tileno_size == 0) { if (cp->tileno_size == 0) {
cp->tileno[cp->tileno_size] = tileno; cp->tileno[cp->tileno_size] = tileno;
@ -5297,8 +5307,18 @@ static void j2k_read_sot(opj_j2k_t *j2k) {
totlen); totlen);
} }
}; }
else
#endif /* USE_JPWL */ #endif /* USE_JPWL */
{
/* totlen is negative or larger than the bytes left!!! */
if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
opj_event_msg(j2k->cinfo, EVT_ERROR,
"JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
totlen, cio_numbytesleft(cio) + 8);
return;
}
}
if (!totlen) if (!totlen)
totlen = cio_numbytesleft(cio) + 8; totlen = cio_numbytesleft(cio) + 8;