commit e8bfbb5378f62830122c4caf4703fe19c00575fb
author Lucy Qu <lqu@google.com> Mon Apr 11 17:14:45 2022 +1000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Apr 11 23:55:40 2022 +0000
tree 1f2af7ec403b92aaddef03e23b40c95f0f224821
parent 436e33c853e2d9bc3f9ad28cf7da29687ef2f722

vm_tools: Fix sommelier crash due to null pointer.

BUG=b:228695632
TEST=None

Change-Id: I5fdf47ba91b75bf7e83410a6a8ea1be6b9f5ddca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3578108
Reviewed-by: Fergus Dall <sidereal@google.com>
Tested-by: Fergus Dall <sidereal@google.com>
Reviewed-by: Timothy Loh <timloh@chromium.org>
Auto-Submit: Lucy Qu <lqu@google.com>
Reviewed-by: David Munro <davidmunro@google.com>
Commit-Queue: David Munro <davidmunro@google.com>
(cherry picked from commit 6e2cc84e0c72794cc45b855fa1cfbe556e03177f)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3581624
Commit-Queue: Lucy Qu <lqu@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

vm_tools/sommelier/sommelier.cc

diff --git a/vm_tools/sommelier/sommelier.cc b/vm_tools/sommelier/sommelier.cc
index d55e645..24a2221 100644
--- a/vm_tools/sommelier/sommelier.cc
+++ b/vm_tools/sommelier/sommelier.cc
@@ -1710,7 +1710,8 @@
     if (parent && parent->xdg_toplevel && window->xdg_toplevel)
       xdg_toplevel_set_parent(window->xdg_toplevel, parent->xdg_toplevel);
   }
-  window->iconified = 0;
+  if (window)
+    window->iconified = 0;
 }
 
 static void sl_handle_focus_out(struct sl_context* ctx,