diff options
Diffstat (limited to 'libavcodec/lzw.c')
| -rw-r--r-- | libavcodec/lzw.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c index 2c99014c2a..43e3e055c2 100644 --- a/libavcodec/lzw.c +++ b/libavcodec/lzw.c @@ -3,20 +3,20 @@ * Copyright (c) 2003 Fabrice Bellard * Copyright (c) 2006 Konstantin Shishkov * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -92,11 +92,6 @@ static int lzw_get_code(struct LZWState * s) return c & s->curmask; } -const uint8_t* ff_lzw_cur_ptr(LZWState *p) -{ - return ((struct LZWState*)p)->pbuf; -} - void ff_lzw_decode_tail(LZWState *p) { struct LZWState *s = (struct LZWState *)p; @@ -191,6 +186,10 @@ int ff_lzw_decode(LZWState *p, uint8_t *buf, int len){ if ((--l) == 0) goto the_end; } + if (s->ebuf < s->pbuf) { + av_log(NULL, AV_LOG_ERROR, "lzw overread\n"); + goto the_end; + } c = lzw_get_code(s); if (c == s->end_code) { break; |