Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Side by Side Diff: core/src/fxcodec/jbig2/JBig2_Image.cpp

Issue 1472113002: Fix a NULL pointer crash in the CJBig2_Image copy constructor. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_Image.h ('k') | core/src/fxcodec/jbig2/JBig2_SddProc.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include <limits.h> 7 #include <limits.h>
8 8
9 #include "JBig2_Image.h" 9 #include "JBig2_Image.h"
10 #include "core/include/fxcrt/fx_coordinates.h" 10 #include "core/include/fxcrt/fx_coordinates.h"
(...skipping 18 matching lines...) Expand all
29 CJBig2_Image::CJBig2_Image(int32_t w, 29 CJBig2_Image::CJBig2_Image(int32_t w,
30 int32_t h, 30 int32_t h,
31 int32_t stride, 31 int32_t stride,
32 uint8_t* pBuf) { 32 uint8_t* pBuf) {
33 m_nWidth = w; 33 m_nWidth = w;
34 m_nHeight = h; 34 m_nHeight = h;
35 m_nStride = stride; 35 m_nStride = stride;
36 m_pData = pBuf; 36 m_pData = pBuf;
37 m_bNeedFree = FALSE; 37 m_bNeedFree = FALSE;
38 } 38 }
39 CJBig2_Image::CJBig2_Image(CJBig2_Image& im) { 39 CJBig2_Image::CJBig2_Image(const CJBig2_Image& im) {
40 m_nWidth = im.m_nWidth; 40 m_nWidth = im.m_nWidth;
41 m_nHeight = im.m_nHeight; 41 m_nHeight = im.m_nHeight;
42 m_nStride = im.m_nStride; 42 m_nStride = im.m_nStride;
43 if (im.m_pData) { 43 if (im.m_pData) {
44 m_pData = FX_Alloc2D(uint8_t, m_nStride, m_nHeight); 44 m_pData = FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
45 JBIG2_memcpy(m_pData, im.m_pData, m_nStride * m_nHeight); 45 JBIG2_memcpy(m_pData, im.m_pData, m_nStride * m_nHeight);
46 } else { 46 } else {
47 m_pData = NULL; 47 m_pData = NULL;
48 } 48 }
49 m_bNeedFree = TRUE; 49 m_bNeedFree = TRUE;
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 dp[2] = (uint8_t)(tmp >> 8); 1090 dp[2] = (uint8_t)(tmp >> 8);
1091 dp[3] = (uint8_t)tmp; 1091 dp[3] = (uint8_t)tmp;
1092 } 1092 }
1093 lineSrc += m_nStride; 1093 lineSrc += m_nStride;
1094 lineDst += pDst->m_nStride; 1094 lineDst += pDst->m_nStride;
1095 } 1095 }
1096 } 1096 }
1097 } 1097 }
1098 return 1; 1098 return 1;
1099 } 1099 }
OLDNEW
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_Image.h ('k') | core/src/fxcodec/jbig2/JBig2_SddProc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698