Browse Source

sgidec: fix error free end detection.

Fixes Ticket1506
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.0
Michael Niedermayer 13 years ago
parent
commit
6fd7bf7b03
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      libavcodec/sgidec.c

+ 3
- 2
libavcodec/sgidec.c View File

@@ -49,12 +49,12 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
unsigned char pixel, count;
unsigned char *orig = out_buf;

while (1) {
while (out_buf < out_end) {
if (bytestream2_get_bytes_left(&s->g) < 1)
return AVERROR_INVALIDDATA;
pixel = bytestream2_get_byteu(&s->g);
if (!(count = (pixel & 0x7f))) {
return (out_buf - orig) / pixelstride;
break;
}

/* Check for buffer overflow. */
@@ -74,6 +74,7 @@ static int expand_rle_row(SgiState *s, uint8_t *out_buf,
}
}
}
return (out_buf - orig) / pixelstride;
}

/**


Loading…
Cancel
Save