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

Unified Diff: core/src/fpdfdoc/doc_bookmark.cpp

Issue 1106333003: Revert "Make CFX_WideString::LockBuffer() completely unused." (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « core/include/fxcrt/fx_string.h ('k') | core/src/fxcrt/fx_basic_bstring.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fpdfdoc/doc_bookmark.cpp
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp
index 88dcf21be115a2198aac2cd5100606eb47adb6ce..9814de61bff20414fa7847194ef9c1aeb05ab3df 100644
--- a/core/src/fpdfdoc/doc_bookmark.cpp
+++ b/core/src/fpdfdoc/doc_bookmark.cpp
@@ -55,13 +55,15 @@ CFX_WideString CPDF_Bookmark::GetTitle() const
return CFX_WideString();
}
CFX_WideString title = pString->GetUnicodeText();
+ FX_LPWSTR buf = title.LockBuffer();
int len = title.GetLength();
- FX_WCHAR buf[len];
for (int i = 0; i < len; i++) {
- FX_WCHAR w = title[i];
- buf[i] = w > 0x20 ? w : 0x20;
+ if (buf[i] < 0x20) {
+ buf[i] = 0x20;
+ }
}
- return CFX_WideString(buf, len);
+ title.ReleaseBuffer(len);
+ return title;
}
CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const
{
« no previous file with comments | « core/include/fxcrt/fx_string.h ('k') | core/src/fxcrt/fx_basic_bstring.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698