aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec/SkJpegDecoderMgr.cpp
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2017-12-01 13:11:09 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-04 14:08:04 +0000
commit3e794595fdcb90f47e80cd8c69f0a1f09176efa2 (patch)
treeb4fc8f06a039c6f94849d6a863975ce97831ace9 /src/codec/SkJpegDecoderMgr.cpp
parent8458a2807b4a7220c9849f8032dc611438818641 (diff)
Fix setjmp/longjump usage in JPEG error handling
Pushes and pops nested jmp_bufs in a stack for proper handling of nested setjmp calls. Ensures longjmp is never called to a stack frame that has exited. Bug: skia: Change-Id: I18d62504f6e5e3eb53026c3b48617b92ea74b905 Reviewed-on: https://skia-review.googlesource.com/79241 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkJpegDecoderMgr.cpp')
-rw-r--r--src/codec/SkJpegDecoderMgr.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp
index c2837aa2b4..e8a31f94e6 100644
--- a/src/codec/SkJpegDecoderMgr.cpp
+++ b/src/codec/SkJpegDecoderMgr.cpp
@@ -91,11 +91,3 @@ JpegDecoderMgr::~JpegDecoderMgr() {
jpeg_destroy_decompress(&fDInfo);
}
}
-
-jmp_buf& JpegDecoderMgr::getJmpBuf() {
- return fErrorMgr.fJmpBuf;
-}
-
-jpeg_decompress_struct* JpegDecoderMgr::dinfo() {
- return &fDInfo;
-}