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

pdf/pdfium/pdfium_page.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_page.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "pdf/pdfium/pdfium_api_string_buffer_adapter.h"
 #include "pdf/pdfium/pdfium_engine.h"
 
 // Used when doing hit detection.
 #define kTolerance 20.0
 
 namespace {
 
 // Dictionary Value key names for returning the accessible page content as JSON.
 const char kPageWidth[] = "width";
 const char kPageHeight[] = "height";
@@ skipping 166 matching lines @@
   base::ListValue* text_nodes = new base::ListValue();
 
   if (area == DOCLINK_AREA) {
     std::string url = kDocLinkURLPrefix + base::IntToString(targets[0].page);
     text_nodes->Append(CreateURLNode(text_utf8, url));
   } else if (area == WEBLINK_AREA && link) {
     text_nodes->Append(CreateURLNode(text_utf8, targets[0].url));
   } else if (area == WEBLINK_AREA && !link) {
     size_t start = 0;
     for (size_t i = 0; i < targets.size(); ++i) {
-      // Remove the extra NULL character at end.
-      // Otherwise, find() will not return any matches.
-      if (targets[i].url.size() > 0 &&
-          targets[i].url[targets[i].url.size() - 1] == '\0') {
-        targets[i].url.resize(targets[i].url.size() - 1);
-      }
-      // There should only ever be one NULL character
-      DCHECK(targets[i].url[targets[i].url.size() - 1] != '\0');
+      // If there is an extra NULL character at end, find() will not return any
+      // matches. There should not be any though.
+      if (!targets[i].url.empty())
+        DCHECK(targets[i].url[targets[i].url.size() - 1] != '\0');
 
       // PDFium may change the case of generated links.
       std::string lowerCaseURL = base::StringToLowerASCII(targets[i].url);
       std::string lowerCaseText = base::StringToLowerASCII(text_utf8);
       size_t pos = lowerCaseText.find(lowerCaseURL, start);
       size_t length = targets[i].url.size();
       if (pos == std::string::npos) {
         // Check if the link is a "mailto:" URL
         if (lowerCaseURL.compare(0, 7, "mailto:") == 0) {
           pos = lowerCaseText.find(lowerCaseURL.substr(7), start);
@@ skipping 98 matching lines @@
           if (dest)
             return GetDestinationTarget(dest, target);
           // TODO(gene): We don't fully support all types of the in-document
           // links. Need to implement that. There is a bug to track that:
           // http://code.google.com/p/chromium/issues/detail?id=55776
         } break;
       case PDFACTION_URI: {
           if (target) {
             size_t buffer_size =
                 FPDFAction_GetURIPath(engine_->doc(), action, NULL, 0);
-            if (buffer_size > 1) {
-              void* data = WriteInto(&target->url, buffer_size);
-              FPDFAction_GetURIPath(engine_->doc(), action, data, buffer_size);
+            if (buffer_size > 0) {
+              PDFiumAPIStringBufferAdapter<std::string> api_string_adapter(
+                  &target->url, buffer_size, true);
+              void* data = api_string_adapter.GetData();
+              size_t bytes_written = FPDFAction_GetURIPath(
+                  engine_->doc(), action, data, buffer_size);
+              api_string_adapter.Close(bytes_written);
             }
           }
           return WEBLINK_AREA;
         } break;
       // TODO(gene): We don't support PDFACTION_REMOTEGOTO and PDFACTION_LAUNCH
       // at the moment.
     }
   }
 
   return NONSELECTABLE_AREA;
@@ skipping 61 matching lines @@
   if (calculated_links_)
     return;
 
   calculated_links_ = true;
   FPDF_PAGELINK links = FPDFLink_LoadWebLinks(GetTextPage());
   int count = FPDFLink_CountWebLinks(links);
   for (int i = 0; i < count; ++i) {
     base::string16 url;
     int url_length = FPDFLink_GetURL(links, i, NULL, 0);
     if (url_length > 0) {
+      PDFiumAPIStringBufferAdapter<base::string16> api_string_adapter(
+          &url, url_length, true);
       unsigned short* data =
-          reinterpret_cast<unsigned short*>(WriteInto(&url, url_length + 1));
-      FPDFLink_GetURL(links, i, data, url_length);
+          reinterpret_cast<unsigned short*>(api_string_adapter.GetData());
+      int actual_length = FPDFLink_GetURL(links, i, data, url_length);
+      api_string_adapter.Close(actual_length);
     }
     Link link;
     link.url = base::UTF16ToUTF8(url);
 
     // If the link cannot be converted to a pp::Var, then it is not possible to
     // pass it to JS. In this case, ignore the link like other PDF viewers.
     // See http://crbug.com/312882 for an example.
     pp::Var link_var(link.url);
     if (!link_var.is_string())
       continue;
@@ skipping 73 matching lines @@
   page_->loading_count_--;
 }
 
 PDFiumPage::Link::Link() {
 }
 
 PDFiumPage::Link::~Link() {
 }
 
 }  // namespace chrome_pdf