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

core/src/fxcodec/codec/fx_codec_jpeg.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <setjmp.h>
 
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcrt/fx_safe_types.h"
@@ skipping 484 matching lines @@
     FXSYS_assert(FALSE);
     return FALSE;
   }
   m_bStarted = TRUE;
   return TRUE;
 }
 uint8_t* CCodec_JpegDecoder::v_GetNextLine() {
   if (m_pExtProvider) {
     return m_pExtProvider->GetNextLine(m_pExtContext);
   }
+
+  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;
 }
 FX_DWORD CCodec_JpegDecoder::GetSrcOffset() {
   if (m_pExtProvider) {
     return m_pExtProvider->GetSrcOffset(m_pExtContext);
   }
   return (FX_DWORD)(m_SrcSize - src.bytes_in_buffer);
 }
 ICodec_ScanlineDecoder* CCodec_JpegModule::CreateDecoder(
@@ skipping 191 matching lines @@
   }
   if (avail_buf_ptr != NULL) {
     *avail_buf_ptr = NULL;
     if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
       *avail_buf_ptr =
           (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
     }
   }
   return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }