fpdfsdk/src/fpdfview.cpp - Issue 860973002: Simplify UTF16LE_Encode and add unittest.

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: fpdfsdk/src/fpdfview.cpp

Issue 860973002: Simplify UTF16LE_Encode and add unittest. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Format Created 5 years, 11 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:

Index: fpdfsdk/src/fpdfview.cpp

diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp

index 43feaf4d5a9154999eb40c893fbe60ef5b59337a..87ef3ee5b21dec21340f4ced8e596e886df6cbe3 100644

--- a/fpdfsdk/src/fpdfview.cpp

+++ b/fpdfsdk/src/fpdfview.cpp

@@ -855,11 +855,9 @@ DLLEXPORT FPDF_DEST STDCALL FPDF_GetNamedDest(FPDF_DOCUMENT document, int index,

CFX_ByteString utf16Name = wsName.UTF16LE_Encode();

unsigned int len = utf16Name.GetLength();

if (!buffer) {

- buflen = len + 2;

- } else if (buflen >= len + 2) {

+ buflen = len;

+ } else if (buflen >= len) {

memcpy(buffer, utf16Name.c_str(), len);

- ((FX_BYTE*)buffer)[len] = 0;

- ((FX_BYTE*)buffer)[len + 1] = 0;

} else {

len = -1;

}