Add a missing setjmp() to CCodec_JpegDecoder::v_GetNextLine().

If jpeg_read_scanlines() ends up calling the error callback, we longjmp
into some undefined state.

BUG=558840
R=thestig@chromium.org, tsepez@chromium.org

Review URL: https://codereview.chromium.org/1463563003 .

1 files changed, 4 insertions, 1 deletions

diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
index 01481c37ec..89b65cfe3d 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -480,9 +480,12 @@ FX_BOOL CCodec_JpegDecoder::v_Rewind() {
   return TRUE;
 }
 uint8_t* CCodec_JpegDecoder::v_GetNextLine() {
+  if (setjmp(m_JmpBuf) == -1)
+    return nullptr;
+
   int nlines = jpeg_read_scanlines(&cinfo, &m_pScanlineBuf, 1);
   if (nlines < 1) {
-    return NULL;
+    return nullptr;
   }
   return m_pScanlineBuf;
 }