Patch: fix weston crash (inline patch)

Submitted by Andrew Engelbrecht on Dec. 2, 2014, 6:02 p.m.

Details

Message ID 547DFECF.1040804@ninthfloor.org
State Not Applicable
Headers show

Not browsing as part of any series.

Commit Message

Andrew Engelbrecht Dec. 2, 2014, 6:02 p.m.
On 12/02/2014 12:18 PM, Andrew Engelbrecht wrote:
> I've attached a patch which fixes the crashing. I mimicked the code in
> the block above it without knowing the overall impact, so it needs
> review from a knowledgeable contributor.

here's the patch in non-attachment form:

 			if (window->frame)

Patch hide | download patch | download mbox

diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index bdfac23..9284a05 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -1326,7 +1326,9 @@  weston_wm_window_handle_state(struct
weston_wm_window *window,
 								WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
 								0, NULL);
 		} else {
-			shell_interface->set_toplevel(window->shsurf);
+			if (window->shsurf)
+				shell_interface->set_toplevel(window->shsurf);
+
 			window->width = window->saved_width;
 			window->height = window->saved_height;

Comments

On Tue, 02 Dec 2014 13:02:55 -0500
Andrew Engelbrecht <sudoman@ninthfloor.org> wrote:

> On 12/02/2014 12:18 PM, Andrew Engelbrecht wrote:
> > I've attached a patch which fixes the crashing. I mimicked the code in
> > the block above it without knowing the overall impact, so it needs
> > review from a knowledgeable contributor.
> 
> here's the patch in non-attachment form:
> 
> diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
> index bdfac23..9284a05 100644
> --- a/xwayland/window-manager.c
> +++ b/xwayland/window-manager.c
> @@ -1326,7 +1326,9 @@ weston_wm_window_handle_state(struct
> weston_wm_window *window,
>  								WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
>  								0, NULL);
>  		} else {
> -			shell_interface->set_toplevel(window->shsurf);
> +			if (window->shsurf)
> +				shell_interface->set_toplevel(window->shsurf);
> +
>  			window->width = window->saved_width;
>  			window->height = window->saved_height;
>  			if (window->frame)
> 

This looks fine to me. I fixed the commit message a bit, and pushed.

Next time would be nice if you used git-send-email.


Thanks,
pq