From: Benjamin Otte <otte@redhat.com>
Date: Mon, 13 Feb 2023 00:08:53 +0000 (+0100)
Subject: Fixes for gdk_memory_texture_new_subtexture checks
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~6^2~2^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98eac8ac830d6c98d3cb187831555b007aaa932b;p=gtk4.git

Fixes for gdk_memory_texture_new_subtexture checks

There were several mistakes here.
---

diff --git a/gdk/gdkmemorytexture.c b/gdk/gdkmemorytexture.c
index 641386b786..85d9ba0a25 100644
--- a/gdk/gdkmemorytexture.c
+++ b/gdk/gdkmemorytexture.c
@@ -178,10 +178,10 @@ gdk_memory_texture_new_subtexture (GdkMemoryTexture  *source,
   GBytes *bytes;
 
   g_return_val_if_fail (GDK_IS_MEMORY_TEXTURE (source), NULL);
-  g_return_val_if_fail (x >= 0 || x < GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (y >= 0 || y < GDK_TEXTURE (source)->height, NULL);
-  g_return_val_if_fail (width > 0 || x + width <= GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (height > 0 || y + height <= GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (x >= 0 && x < GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (y >= 0 && y < GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (width > 0 && x + width <= GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (height > 0 && y + height <= GDK_TEXTURE (source)->height, NULL);
 
   texture = GDK_TEXTURE (source);
   bpp = gdk_memory_format_bytes_per_pixel (texture->format);