xfa/fgas/font/fgas_stdfontmgr.cpp - Issue 2430743003: in the attempt to fix 627393, changed IFX_FileRead's readBlock to return the length it reads

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: xfa/fgas/font/fgas_stdfontmgr.cpp

Issue 2430743003: in the attempt to fix 627393, changed IFX_FileRead's readBlock to return the length it reads

Patch Set: fix an undefined variable Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: xfa/fgas/font/fgas_stdfontmgr.cpp

diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp

index d4907bb91980d80805bab6fd1149383cddf5eafa..8ca58492a911abf078c5729a7025c364db97d89c 100644

--- a/xfa/fgas/font/fgas_stdfontmgr.cpp

+++ b/xfa/fgas/font/fgas_stdfontmgr.cpp

@@ -869,9 +869,10 @@ unsigned long _ftStreamRead(FXFT_Stream stream,

IFX_SeekableReadStream* pFile =

(IFX_SeekableReadStream*)stream->descriptor.pointer;

- int res = pFile->ReadBlock(buffer, offset, count);

- if (res)

- return count;

+ unsigned long readSize =

+ static_cast<unsigned long>(pFile->ReadBlock(buffer, offset, count));

+ if (readSize == count || pFile->IsEOF())

+ return readSize;

return 0;

}