core/src/fxcrt/fx_basic_maps.cpp - Issue 1145843005: Revert "Remove FX_Alloc() null checks now that it can't return NULL."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxcrt/fx_basic_maps.cpp

Issue 1145843005: Revert "Remove FX_Alloc() null checks now that it can't return NULL." (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 5 years, 7 months 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 side-by-side diff with in-line comments

Download patch

Index: core/src/fxcrt/fx_basic_maps.cpp

diff --git a/core/src/fxcrt/fx_basic_maps.cpp b/core/src/fxcrt/fx_basic_maps.cpp

index 7fca42acde20fd24318ca4eb514ed472ecb32e72..8ae44ce6a0f68a2923525190c31545515e7cb439 100644

--- a/core/src/fxcrt/fx_basic_maps.cpp

+++ b/core/src/fxcrt/fx_basic_maps.cpp

@@ -413,7 +413,9 @@ static void _CompactStringStore(_CompactString* pCompact, FX_LPCBYTE pStr, int l

pCompact->m_LenHigh = len / 256;

pCompact->m_LenLow = len % 256;

pCompact->m_pBuffer = FX_Alloc(FX_BYTE, len);

- FXSYS_memcpy32(pCompact->m_pBuffer, pStr, len);

+ if (pCompact->m_pBuffer) {

+ FXSYS_memcpy32(pCompact->m_pBuffer, pStr, len);

+ }

}

static CFX_ByteStringC _CompactStringGet(_CompactString* pCompact)

{

« no previous file with comments | « core/src/fxcrt/fx_basic_buffer.cpp ('k') | core/src/fxcrt/fx_basic_plex.cpp » ('j') | no next file with comments »