Only destroy huffman if build succeeded.

src/images/SkImageDecoder_libjpeg.cpp

 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
@@ skipping 125 matching lines @@
     /**
      *  Build the index to be used for tile based decoding.
      *  Must only be called after a successful call to
      *  initializeInfoAndReadHeader and must not be called more
      *  than once.
      */
     bool buildHuffmanIndex() {
         SkASSERT(fReadHeaderSucceeded);
         SkASSERT(!fHuffmanCreated);
         jpeg_create_huffman_index(&fCInfo, &fHuffmanIndex);
-        fHuffmanCreated = true;
         SkASSERT(1 == fCInfo.scale_num && 1 == fCInfo.scale_denom);
-        return jpeg_build_huffman_index(&fCInfo, &fHuffmanIndex);
+        fHuffmanCreated = jpeg_build_huffman_index(&fCInfo, &fHuffmanIndex);
+        return fHuffmanCreated;
     }
 
     /**
      *  Start tile based decoding. Must only be called after a
      *  successful call to buildHuffmanIndex, and must only be
      *  called once.
      */
     bool startTileDecompress() {
         SkASSERT(fHuffmanCreated);
         SkASSERT(fReadHeaderSucceeded);
@@ skipping 994 matching lines @@
 }
 
 static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
     return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
 }
 
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libjpeg_dfactory);
 static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_jpeg);
 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libjpeg_efactory);