Make CFX_WideString::LockBuffer() completely unused.

core/src/fpdfdoc/doc_bookmark.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include <vector>
+
+#include "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/fpdfdoc/fpdf_doc.h"
+
 CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild(const CPDF_Bookmark& parent) const
 {
     if (!parent.m_pDict) {
         CPDF_Dictionary* pRoot = m_pDocument->GetRoot()->GetDict("Outlines");
         if (!pRoot) {
             return CPDF_Bookmark();
         }
         return CPDF_Bookmark(pRoot->GetDict("First"));
     }
     return CPDF_Bookmark(parent.m_pDict->GetDict("First"));
@@ skipping 30 matching lines @@
 CFX_WideString CPDF_Bookmark::GetTitle() const
 {
     if (!m_pDict) {
         return CFX_WideString();
     }
     CPDF_String* pString = (CPDF_String*)m_pDict->GetElementValue("Title");
     if (!pString || pString->GetType() != PDFOBJ_STRING) {
         return CFX_WideString();
     }
     CFX_WideString title = pString->GetUnicodeText();
-    FX_LPWSTR buf = title.LockBuffer();
     int len = title.GetLength();
+    nonstd::unique_ptr<std::vector<FX_WCHAR> > vec;
+    vec.reset(new std::vector<FX_WCHAR>(len));
+    FX_WCHAR* buf = &vec->front();

[Lei Zhang, 2015/04/27 22:50:46]

Can we first check |len| and just return a CFX_WideString() if |len| is 0?
Otherwise, if |len| is 0, the value returned by |vec->front()| is undefined.

[Tom Sepez, 2015/04/28 19:02:20]

Done.

     for (int i = 0; i < len; i++) {
-        if (buf[i] < 0x20) {
-            buf[i] = 0x20;
-        }
+        FX_WCHAR w = title[i];
+        buf[i] = w > 0x20 ? w : 0x20;
     }
-    title.ReleaseBuffer(len);
-    return title;
+    return CFX_WideString(buf, len);
 }
 CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const
 {
     if (!m_pDict) {
         return CPDF_Dest();
     }
     CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
     if (!pDest) {
         return CPDF_Dest();
     }
     if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
         CPDF_NameTree name_tree(pDocument, FX_BSTRC("Dests"));
         CFX_ByteStringC name = pDest->GetString();
         return CPDF_Dest(name_tree.LookupNamedDest(pDocument, name));
     }
     if (pDest->GetType() == PDFOBJ_ARRAY) {
         return CPDF_Dest((CPDF_Array*)pDest);
     }
     return CPDF_Dest();
 }
 CPDF_Action CPDF_Bookmark::GetAction() const
 {
     if (!m_pDict) {
         return CPDF_Action();
     }
     return CPDF_Action(m_pDict->GetDict("A"));
 }