diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-08-03 19:16:55 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-08-03 19:16:55 +0000 |
| commit | d4dda31a532ca1cebfe5f518dc3d738a8d8df7e0 (patch) | |
| tree | 5d9f5fa772167b920be706cab80cc0ed282acb06 | |
| parent | ea633a79bdaf4e1a00df26f5d4cdcf60e39247c1 (diff) | |
| download | tigervnc-d4dda31a532ca1cebfe5f518dc3d738a8d8df7e0.tar.gz tigervnc-d4dda31a532ca1cebfe5f518dc3d738a8d8df7e0.zip | |
Handle erroneous Huffman codes
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4115 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | common/jpeg/jdhuff.c | 3 | ||||
| -rw-r--r-- | common/jpeg/jdhuff.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common/jpeg/jdhuff.c b/common/jpeg/jdhuff.c index cbab592e..04b38d5d 100644 --- a/common/jpeg/jdhuff.c +++ b/common/jpeg/jdhuff.c @@ -16,7 +16,7 @@ /* Modifications: * Copyright (C)2007 Sun Microsystems, Inc. - * Copyright (C)2009 D. R. Commander + * Copyright (C)2009-2010 D. R. Commander * * This library is free software and may be redistributed and/or modified under * the terms of the wxWindows Library License, Version 3.1 or (at your option) @@ -240,6 +240,7 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, dtbl->maxcode[l] = -1; /* -1 if no codes of this length */ } } + dtbl->valoffset[17] = 0; dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */ /* Compute lookahead tables to speed up decoding. diff --git a/common/jpeg/jdhuff.h b/common/jpeg/jdhuff.h index 0a242c5e..2697488f 100644 --- a/common/jpeg/jdhuff.h +++ b/common/jpeg/jdhuff.h @@ -2,6 +2,7 @@ * jdhuff.h * * Copyright (C) 1991-1997, Thomas G. Lane. + * Copyright (C) 2010, D. R. Commander. * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * @@ -27,7 +28,7 @@ typedef struct { /* Basic tables: (element [0] of each array is unused) */ INT32 maxcode[18]; /* largest code of length k (-1 if none) */ /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */ - INT32 valoffset[17]; /* huffval[] offset for codes of length k */ + INT32 valoffset[18]; /* huffval[] offset for codes of length k */ /* valoffset[k] = huffval[] index of 1st symbol of code length k, less * the smallest code of length k; so given a code of length k, the * corresponding symbol is huffval[code + valoffset[k]] |