Prevent guest views from issuing a search for empty text.

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 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_engine.h"
 
 #include <math.h>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 1214 matching lines @@
       feature = "Screen";
       break;
     case FPDF_UNSP_ANNOT_SIG:
       feature = "Digital_Signature";
       break;
   }
   client_->DocumentHasUnsupportedFeature(feature);
 }
 
 void PDFiumEngine::ContinueFind(int32_t result) {
-  StartFind(current_find_text_.c_str(), !!result);
+  StartFind(current_find_text_, result != 0);
 }
 
 bool PDFiumEngine::HandleEvent(const pp::InputEvent& event) {
   DCHECK(!defer_page_unload_);
   defer_page_unload_ = true;
   bool rv = false;
   switch (event.GetType()) {
     case PP_INPUTEVENT_TYPE_MOUSEDOWN:
       rv = OnMouseDown(pp::MouseInputEvent(event));
       break;
@@ skipping 656 matching lines @@
   if (last_page_mouse_down_ == -1)
     return false;
 
   base::string16 str = base::UTF8ToUTF16(event.GetCharacterText().AsString());
   return !!FORM_OnChar(
       form_, pages_[last_page_mouse_down_]->GetPage(),
       str[0],
       event.GetModifiers());
 }
 
-void PDFiumEngine::StartFind(const char* text, bool case_sensitive) {
-  // We can get a call to StartFind before we have any page information (i.e.
+void PDFiumEngine::StartFind(const std::string& text, bool case_sensitive) {
+  // If the caller asks StartFind() to search for no text, then this is an
+  // error on the part of the caller. The PPAPI Find_Private interface
+  // guarantees it is not empty, so this should never happen.
+  DCHECK(!text.empty());
+
+  // If StartFind() gets called before we have any page information (i.e.
   // before the first call to LoadDocument has happened). Handle this case.
   if (pages_.empty())
     return;
 
-  bool first_search = false;
+  bool first_search = (current_find_text_ != text);
   int character_to_start_searching_from = 0;
-  if (current_find_text_ != text) {  // First time we search for this text.
-    first_search = true;
+  if (first_search) {
     std::vector<PDFiumRange> old_selection = selection_;
     StopFind();
     current_find_text_ = text;
 
     if (old_selection.empty()) {
       // Start searching from the beginning of the document.
       next_page_to_search_ = 0;
       last_page_to_search_ = pages_.size() - 1;
       last_character_index_to_search_ = -1;
     } else {
@@ skipping 1493 matching lines @@
   if (current_find_index_.valid())
     resume_find_index_.SetIndex(current_find_index_.GetIndex());
   else
     resume_find_index_.Invalidate();
 
   InvalidateAllPages();
 
   if (!current_find_text.empty()) {
     // Clear the UI.
     client_->NotifyNumberOfFindResultsChanged(0, false);
-    StartFind(current_find_text.c_str(), false);
+    StartFind(current_find_text, false);
   }
 }
 
 void PDFiumEngine::SetSelecting(bool selecting) {
   bool was_selecting = selecting_;
   selecting_ = selecting;
   if (selecting_ != was_selecting)
     client_->IsSelectingChanged(selecting);
 }
 
@@ skipping 544 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf