[mutter/gnome-42] window: Type check some wm functions
- From: Robert Mader <rmader src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gnome-42] window: Type check some wm functions
- Date: Mon, 17 Oct 2022 13:16:31 +0000 (UTC)
commit f951e87027df94f0025bb05abe25bd0c440c7d94
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Fri Oct 14 21:56:10 2022 +0200
window: Type check some wm functions
These might get called from JS, so avoid crashing on bogus calls.
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5952
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2661>
(cherry picked from commit a331d4e45a2156703041efd6e22dbaba19018d54)
src/core/window.c | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/src/core/window.c b/src/core/window.c
index e7278e48c2..c2dc672bb8 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2467,6 +2467,7 @@ queue_calc_showing_func (MetaWindow *window,
void
meta_window_minimize (MetaWindow *window)
{
+ g_return_if_fail (META_IS_WINDOW (window));
g_return_if_fail (!window->override_redirect);
if (!window->minimized)
@@ -2620,6 +2621,7 @@ meta_window_maximize (MetaWindow *window,
MetaRectangle *saved_rect = NULL;
gboolean maximize_horizontally, maximize_vertically;
+ g_return_if_fail (META_IS_WINDOW (window));
g_return_if_fail (!window->override_redirect);
/* At least one of the two directions ought to be set */
@@ -2893,6 +2895,8 @@ update_edge_constraints (MetaWindow *window)
void
meta_window_untile (MetaWindow *window)
{
+ g_return_if_fail (META_IS_WINDOW (window));
+
window->tile_monitor_number =
window->saved_maximize ? window->monitor->number
: -1;
@@ -2913,6 +2917,8 @@ meta_window_tile (MetaWindow *window,
MetaMaximizeFlags directions;
MetaRectangle old_frame_rect, old_buffer_rect;
+ g_return_if_fail (META_IS_WINDOW (window));
+
meta_window_get_tile_fraction (window, tile_mode, &window->tile_hfraction);
window->tile_mode = tile_mode;
@@ -3052,6 +3058,7 @@ meta_window_unmaximize (MetaWindow *window,
{
gboolean unmaximize_horizontally, unmaximize_vertically;
+ g_return_if_fail (META_IS_WINDOW (window));
g_return_if_fail (!window->override_redirect);
/* At least one of the two directions ought to be set */
@@ -3257,6 +3264,7 @@ meta_window_make_fullscreen_internal (MetaWindow *window)
void
meta_window_make_fullscreen (MetaWindow *window)
{
+ g_return_if_fail (META_IS_WINDOW (window));
g_return_if_fail (!window->override_redirect);
if (!window->fullscreen)
@@ -3283,6 +3291,7 @@ meta_window_make_fullscreen (MetaWindow *window)
void
meta_window_unmake_fullscreen (MetaWindow *window)
{
+ g_return_if_fail (META_IS_WINDOW (window));
g_return_if_fail (!window->override_redirect);
if (window->fullscreen)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]