[embedlite] Add better guard for dispatch event

sailfishos · Jan 30, 2019 · ecd66e3 · ecd66e3
1 parent e80e35a
commit ecd66e3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
@@ -439,6 +439,7 @@ NS_IMETHODIMP
 EmbedLitePuppetWidget::DispatchEvent(WidgetGUIEvent* event, nsEventStatus& aStatus)
 {
   LOGT();
+  MOZ_ASSERT(event);
   aStatus = nsEventStatus_eIgnore;
 
   nsIWidgetListener* listener =
@@ -466,7 +467,11 @@ EmbedLitePuppetWidget::DispatchEvent(WidgetGUIEvent* event, nsEventStatus& aStat
      mNativeIMEContext = compositionEvent->mNativeIMEContext;
   }
 
-  aStatus = listener->HandleEvent(event, mUseAttachedEvents);
+  if (listener) {
+    aStatus = listener->HandleEvent(event, mUseAttachedEvents);
+  } else {
+    aStatus = nsEventStatus_eIgnore;
+  }
 
   switch (event->mMessage) {
     case eCompositionStart: