Fix infinite loop causing iterator to go out of bounds.

ash/virtual_keyboard_controller.cc

 // Copyright 2014 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 "ash/virtual_keyboard_controller.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 57 matching lines @@
 
   // Checks for touchscreens.
   has_touchscreen_ = device_data_manager->touchscreen_devices().size() > 0;
 
   // Checks for keyboards.
   has_external_keyboard_ = false;
   has_internal_keyboard_ = false;
   std::vector<ui::KeyboardDevice> keyboards =
       device_data_manager->keyboard_devices();
   for (auto iter = keyboards.begin();
-       iter != keyboards.end() ||
-           (has_internal_keyboard_ && has_external_keyboard_);
+       iter != keyboards.end() &&
+           (!has_internal_keyboard_ || !has_external_keyboard_);
        ++iter) {

[oshima, 2014/11/05 01:34:37]

how about

for (ui::KeyboardDevice* device : keyboards) {
  if (has_internal_keyboard_ && has_external_keyboard_)
    break;

}

[rsadam, 2014/11/05 01:42:32]

NInja complains if I make it a pointer, other than that, done!

     ui::InputDeviceType type = (*iter).type;
     if (type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL)
       has_internal_keyboard_ = true;
     if (type == ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)
       has_external_keyboard_ = true;
   }
   // Update keyboard state.
   UpdateKeyboardEnabled();
 }
 
@@ skipping 18 matching lines @@
   keyboard::SetTouchKeyboardEnabled(enabled);
   if (enabled) {
     Shell::GetInstance()->CreateKeyboard();
   } else {
     if (!keyboard::IsKeyboardEnabled())
       Shell::GetInstance()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash