diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-27 08:15:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-27 08:15:59 -0700 |
| commit | 3bd7488e6bad28fab3c32b4c44e37891655bc033 (patch) | |
| tree | cc6c05102a9661544acbbee9eaa21d10294cef1f | |
| parent | 41aa7b9fc3ae452215876143852024720383e102 (diff) | |
| parent | 1dccc9f3e889a5b702ec201129db689ab64a5eb8 (diff) | |
| download | external_skia-3bd7488e6bad28fab3c32b4c44e37891655bc033.zip external_skia-3bd7488e6bad28fab3c32b4c44e37891655bc033.tar.gz external_skia-3bd7488e6bad28fab3c32b4c44e37891655bc033.tar.bz2 | |
am 1dccc9f3: am 372648a7: Merge "Fix access to freed memory"
* commit '1dccc9f3e889a5b702ec201129db689ab64a5eb8':
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; |