From: Foxe Chen <chen.foxe@gmail.com>
Date: Tue, 16 Jun 2026 19:08:10 +0000 (+0000)
Subject: patch 9.2.0655: GTK4: missing NULL checks in vim_form_measure()
X-Git-Tag: v9.2.0655^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b528ddcfe0dd60b4c42e0b08f4ace0ae3da5e9fb;p=thirdparty%2Fvim.git

patch 9.2.0655: GTK4: missing NULL checks in vim_form_measure()

Problem:  GTK4: missing NULL checks in vim_form_measure()
Solution: Add NULL tests (Foxe Chen)

closes: #20536

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/gui_gtk4_f.c b/src/gui_gtk4_f.c
index 7306d78c2e..4bd22db3f4 100644
--- a/src/gui_gtk4_f.c
+++ b/src/gui_gtk4_f.c
@@ -262,14 +262,26 @@ vim_form_measure(
 	int		*natural_baseline)
 {
     if (orientation == GTK_ORIENTATION_VERTICAL)
+    {
 	// Set minimum height of form widget to 4 rows.
-	*minimum = *natural = gui.char_height * 4;
+	if (minimum != NULL)
+	    *minimum  = gui.char_height * 4;
+	if (natural != NULL)
+	    *natural = gui.char_height * 4;
+    }
     else
+    {
 	// Set minimum width of form widget to 10 columns.
-	*minimum = *natural = gui.char_width * 10;
+	if (minimum != NULL)
+	    *minimum  = gui.char_width * 10;
+	if (natural != NULL)
+	    *natural = gui.char_width * 10;
+    }
 
-    *minimum_baseline = -1;
-    *natural_baseline = -1;
+    if (minimum_baseline != NULL)
+	*minimum_baseline = -1;
+    if (natural_baseline != NULL)
+	*natural_baseline = -1;
 }
 
 
diff --git a/src/version.c b/src/version.c
index 7e6c274f18..56f8a65908 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    655,
 /**/
     654,
 /**/