PDF: Yet another stab at getting WriteInto() buffer sizes correct.

pdf/pdfium/pdfium_range.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/pdfium/pdfium_range.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "pdf/pdfium/pdfium_api_string_buffer_adapter.h"
 
 namespace chrome_pdf {
 
 PDFiumRange::PDFiumRange(PDFiumPage* page, int char_index, int char_count)
     : page_(page),
       char_index_(char_index),
       char_count_(char_count),
       cached_screen_rects_zoom_(0) {
 }
 
@@ skipping 40 matching lines @@
 base::string16 PDFiumRange::GetText() {
   int index = char_index_;
   int count = char_count_;
   base::string16 rv;
   if (count < 0) {
     count *= -1;
     index -= count - 1;
   }
 
   if (count > 0) {
+    PDFiumAPIStringBufferAdapter<base::string16> api_string_adapter(&rv,
+                                                                    count,
+                                                                    false);
     unsigned short* data =
-        reinterpret_cast<unsigned short*>(WriteInto(&rv, count + 1));
-    // |written| includes the trailing terminator, so get rid of the trailing
-    // NUL character by calling resize().
+        reinterpret_cast<unsigned short*>(api_string_adapter.GetData());
     int written = FPDFText_GetText(page_->GetTextPage(), index, count, data);
-    if (written < 1)
-      rv.resize(0);
-    else
-      rv.resize(written - 1);
+    api_string_adapter.Close(written);
   }
 
   return rv;
 }
 
 }  // namespace chrome_pdf