diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-12-01 13:11:09 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-04 14:08:04 +0000 |
| commit | 3e794595fdcb90f47e80cd8c69f0a1f09176efa2 (patch) | |
| tree | b4fc8f06a039c6f94849d6a863975ce97831ace9 /src/codec/SkJpegDecoderMgr.h | |
| parent | 8458a2807b4a7220c9849f8032dc611438818641 (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.h')
| -rw-r--r-- | src/codec/SkJpegDecoderMgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/codec/SkJpegDecoderMgr.h b/src/codec/SkJpegDecoderMgr.h index 272c5b4b1c..f3834fe79b 100644 --- a/src/codec/SkJpegDecoderMgr.h +++ b/src/codec/SkJpegDecoderMgr.h @@ -54,14 +54,14 @@ public: ~JpegDecoderMgr(); /* - * Get the jump buffer in order to set an error return point + * Get the skjpeg_error_mgr in order to set an error return jmp_buf */ - jmp_buf& getJmpBuf(); + skjpeg_error_mgr* errorMgr() { return &fErrorMgr; } /* * Get function for the decompress info struct */ - jpeg_decompress_struct* dinfo(); + jpeg_decompress_struct* dinfo() { return &fDInfo; } private: |