Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3907)

Unified Diff: chrome/browser/chromeos/input_method/ibus_engine_controller.cc

Issue 10823096: Fix crash caused by uninstalling extension IME. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/ibus_engine_controller.cc
diff --git a/chrome/browser/chromeos/input_method/ibus_engine_controller.cc b/chrome/browser/chromeos/input_method/ibus_engine_controller.cc
index e52e143b3aad2adb9b76fad8b327ea0508137678..5fd91e786cca7d5d8793dc08685fb34db944f6d6 100644
--- a/chrome/browser/chromeos/input_method/ibus_engine_controller.cc
+++ b/chrome/browser/chromeos/input_method/ibus_engine_controller.cc
@@ -886,8 +886,11 @@ class IBusEngineControllerImpl : public IBusEngineController {
g_object_unref(chromeos_engine->table);
chromeos_engine->table = NULL;
}
- if (ibus_bus_is_connected(chromeos_engine->connection->ibus_)) {
- // We can't call destroy function without ibus-daemon connection,
+ if (chromeos_engine->connection &&
+ ibus_bus_is_connected(chromeos_engine->connection->ibus_)) {
+ // Connection may be NULL since extension IME can be uninstalled before
+ // |OnDestroy| is called.
+ // We can't call |destroy| function without ibus-daemon connection,
// otherwise browser goes into deadlock state.
// TODO(nona): investigate the reason of dead-lock.
IBUS_OBJECT_CLASS(ibus_chromeos_engine_parent_class)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698