It looks like the error-checking code assumes the popup's parent is
a shell surface - but that's not always the case.
Signed-off-by: Dima Ryazanov <d...@gmail.com>
---
desktop-shell/shell.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index f7c928e..0159547 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3392,7 +3392,7 @@ add_popup_grab(struct shell_surface *shsurf,
parent = get_shell_surface(shsurf->parent);
top_surface = get_top_popup(shseat);
- if (shell_surface_is_xdg_popup(shsurf) &&
+ if (parent && shell_surface_is_xdg_popup(shsurf) &&
((top_surface == NULL && !shell_surface_is_xdg_surface(parent)) ||
(top_surface != NULL && parent != top_surface))) {
wl_resource_post_error(shsurf->owner->resource,
@@ -4098,12 +4098,13 @@ create_xdg_popup(struct shell_client *owner, void
*shell,
{
struct shell_surface *shsurf, *parent_shsurf;
- /* Verify that we are creating the top most popup when mapping,
- * as its not until then we know whether it was mapped as most
+ /* Verify that we are creating the topmost popup when mapping,
+ * as it's not until then we know whether it was mapped as most
* top level or not. */
parent_shsurf = get_shell_surface(parent);
- if (!shell_surface_is_xdg_popup(parent_shsurf) &&
+ if (parent_shsurf &&
+ !shell_surface_is_xdg_popup(parent_shsurf) &&
!shell_surface_is_xdg_surface(parent_shsurf)) {
wl_resource_post_error(owner->resource,
XDG_POPUP_ERROR_INVALID_PARENT,
--
2.1.0
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
