libwebp: update to 0.4.2-rc2

third_party/libwebp/dec/vp8l.c

 // Copyright 2012 Google Inc. All Rights Reserved.
 //
 // Use of this source code is governed by a BSD-style license
 // that can be found in the COPYING file in the root of the source
 // tree. An additional intellectual property rights grant can be found
 // in the file PATENTS. All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 // -----------------------------------------------------------------------------
 //
 // main entry for the decoder
@@ skipping 216 matching lines @@
       } else {
         const int length = use_prev ? prev_code_len : 0;
         while (repeat-- > 0) code_lengths[symbol++] = length;
       }
     }
   }
   ok = 1;
 
  End:
   VP8LHuffmanTreeFree(&tree);
+  if (!ok) dec->status_ = VP8_STATUS_BITSTREAM_ERROR;
   return ok;
 }
 
 // 'code_lengths' is pre-allocated temporary buffer, used for creating Huffman
 // tree.
 static int ReadHuffmanCode(int alphabet_size, VP8LDecoder* const dec,
                            int* const code_lengths, int* const huff_codes,
                            HuffmanTree* const tree) {
   int ok = 0;
   VP8LBitReader* const br = &dec->br_;
@@ skipping 547 matching lines @@
           ExtractPalettedAlphaRows(dec, row);
         }
       }
       if (pos < last && (col & mask)) {
         htree_group = GetHtreeGroupForPos(hdr, col, row);
       }
     } else {  // Not reached
       ok = 0;
       goto End;
     }
+    assert(br->eos_ == VP8LIsEndOfStream(br));
     ok = !br->error_;
     if (!ok) goto End;
   }
   // Process the remaining rows corresponding to last row-block.
   ExtractPalettedAlphaRows(dec, row);
 
  End:
   if (br->error_ || !ok || (br->eos_ && pos < end)) {
     ok = 0;
     dec->status_ = br->eos_ ? VP8_STATUS_SUSPENDED
@@ skipping 97 matching lines @@
       assert(color_cache != NULL);
       while (last_cached < src) {
         VP8LColorCacheInsert(color_cache, *last_cached++);
       }
       *src = VP8LColorCacheLookup(color_cache, key);
       goto AdvanceByOne;
     } else {  // Not reached
       ok = 0;
       goto End;
     }
+    assert(br->eos_ == VP8LIsEndOfStream(br));
     ok = !br->error_;
     if (!ok) goto End;
   }
   // Process the remaining rows corresponding to last row-block.
   if (process_func != NULL) process_func(dec, row);
 
  End:
   if (br->error_ || !ok || (br->eos_ && src < src_end)) {
     ok = 0;
     dec->status_ = br->eos_ ? VP8_STATUS_SUSPENDED
@@ skipping 416 matching lines @@
   return 0;
 }
 
 int VP8LDecodeImage(VP8LDecoder* const dec) {
   VP8Io* io = NULL;
   WebPDecParams* params = NULL;
 
   // Sanity checks.
   if (dec == NULL) return 0;
 
+  dec->status_ = VP8_STATUS_BITSTREAM_ERROR;
+  assert(dec->hdr_.htree_groups_ != NULL);
+  assert(dec->hdr_.num_htree_groups_ > 0);
+
   io = dec->io_;
   assert(io != NULL);
   params = (WebPDecParams*)io->opaque;
   assert(params != NULL);
   dec->output_ = params->output;
   assert(dec->output_ != NULL);
 
   // Initialization.
   if (!WebPIoInitFromOptions(params->options, io, MODE_BGRA)) {
     dec->status_ = VP8_STATUS_INVALID_PARAM;
@@ skipping 21 matching lines @@
   VP8LClear(dec);
   return 1;
 
  Err:
   VP8LClear(dec);
   assert(dec->status_ != VP8_STATUS_OK);
   return 0;
 }
 
 //------------------------------------------------------------------------------