diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-27 08:13:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-27 08:13:22 -0700 |
| commit | 1dccc9f3e889a5b702ec201129db689ab64a5eb8 (patch) | |
| tree | b6b073ba09659a6382005401994401fb72f70382 | |
| parent | 5f421caf157bf54c2cfd2ded128ede466e761d4d (diff) | |
| parent | 372648a70bbb2778edcdad588c8d133a6c55a033 (diff) | |
| download | external_skia-1dccc9f3e889a5b702ec201129db689ab64a5eb8.zip external_skia-1dccc9f3e889a5b702ec201129db689ab64a5eb8.tar.gz external_skia-1dccc9f3e889a5b702ec201129db689ab64a5eb8.tar.bz2 | |
am 372648a7: Merge "Fix access to freed memory"
* commit '372648a70bbb2778edcdad588c8d133a6c55a033':
Fix access to freed memory
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index fbb6887..33f222c 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -48,9 +48,9 @@ public: SkJPEGImageIndex() {} virtual ~SkJPEGImageIndex() { jpeg_destroy_huffman_index(index); - delete cinfo->src; jpeg_finish_decompress(cinfo); jpeg_destroy_decompress(cinfo); + delete cinfo->src; free(cinfo); } jpeg_decompress_struct *cinfo; |