From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 16 May 2023 21:32:13 +0000 (-0400)
Subject: gsk: Fix a crash
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~3^2~1^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e8869391bbd4437c388a1b7784d63a9374a36d1d;p=gtk4.git

gsk: Fix a crash

When we start ignoring batches, we must do it everywhere,
or we may run into assertions. This was triggered by an
enormous text node tree produced by tests/rendernode-create.
---

diff --git a/gsk/gl/gskglcommandqueue.c b/gsk/gl/gskglcommandqueue.c
index a8624642f0..460d0f2489 100644
--- a/gsk/gl/gskglcommandqueue.c
+++ b/gsk/gl/gskglcommandqueue.c
@@ -662,6 +662,10 @@ gsk_gl_command_queue_split_draw (GskGLCommandQueue *self)
 
   g_assert (GSK_IS_GL_COMMAND_QUEUE (self));
   g_assert (self->batches.len > 0);
+
+  if (will_ignore_batch (self))
+    return;
+
   g_assert (self->in_draw == TRUE);
 
   program = self->program_info;