diff options
| author |  reed <reed@chromium.org> | 2015-03-07 06:05:51 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-07 06:05:51 -0800 |
| commit | 8371b7e8ef62f23f56ba56e4d96eb0756a8a303c (patch) | |
| tree | ca55294aa7b3e519f64daedde3de846e615188b2 /src/images | |
| parent | 561a1ca9559a1ea7589ab93350124284fcef3315 (diff) | |
Revert of Fix a memory leak when decoding corrupted indexed PNGs. (patchset #2 id:20001 of https://codereview.chromium.org/951663002/)
Reason for revert:
speculative revert due to many failures in tree
Original issue's description:
> Fix a memory leak when decoding corrupted indexed PNGs.
> Commit to branch refs/heads/png-leak
>
> BUG=skia:3457
>
> Committed: https://skia.googlesource.com/skia/+/561a1ca9559a1ea7589ab93350124284fcef3315
TBR=scroggo@google.com,dml@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3457
Review URL: https://codereview.chromium.org/980203005
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libpng.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp index c074268cff..f9ef6b7942 100644 --- a/src/images/SkImageDecoder_libpng.cpp +++ b/src/images/SkImageDecoder_libpng.cpp @@ -362,12 +362,6 @@ SkImageDecoder::Result SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap SkAutoLockPixels alp(*decodedBitmap); - // Repeat setjmp, otherwise variables declared since the last call (e.g. alp - // and aur) won't get their destructors called in case of a failure. - if (setjmp(png_jmpbuf(png_ptr))) { - return kFailure; - } - /* Turn on interlace handling. REQUIRED if you are not using * png_read_image(). To see how to handle interlacing passes, * see the png_read_row() method below: |