[Scummvm-git-logs] scummvm master -> 0f269b7b4e4ecb8df8f79f96aabfc20a2fe64ae5

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
0f269b7b4e M4: Fix CID 1533002 and 1532937 + add some const


Commit: 0f269b7b4e4ecb8df8f79f96aabfc20a2fe64ae5
    https://github.com/scummvm/scummvm/commit/0f269b7b4e4ecb8df8f79f96aabfc20a2fe64ae5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-28T09:01:49+01:00

Commit Message:
M4: Fix CID 1533002 and 1532937 + add some const

Changed paths:
    engines/m4/gui/gui_item.cpp


diff --git a/engines/m4/gui/gui_item.cpp b/engines/m4/gui/gui_item.cpp
index c5a2856f50c..ea76581a1cd 100644
--- a/engines/m4/gui/gui_item.cpp
+++ b/engines/m4/gui/gui_item.cpp
@@ -977,7 +977,7 @@ bool DoubleClickOnListBox(Item *myItem, int32 xOffset, int32 yOffset) {
 	Font *currFont = gr_font_get();
 	if (currFont != myItem->myFont)
 		gr_font_set(myItem->myFont);
-	int32 fontHeight = gr_font_get_height();
+	const int32 fontHeight = gr_font_get_height();
 	if (currFont != myItem->myFont)
 		gr_font_set(currFont);
 
@@ -1116,7 +1116,7 @@ bool ClickOnListBox(Item *myItem, int32 xOffset, int32 yOffset, int32 scrollType
 		Font *currFont = gr_font_get();
 		if (myItem->myFont != currFont)
 			gr_font_set(myItem->myFont);
-		int32 fontHeight = gr_font_get_height();
+		const int32 fontHeight = gr_font_get_height();
 		if (myItem->myFont != currFont)
 			gr_font_set(currFont);
 
@@ -1199,7 +1199,7 @@ bool Item_change_prompt(Item *myItem, const char *newPrompt) {
 	Font *currFont = gr_font_get();
 	if (myItem->myFont != currFont)
 		gr_font_set(myItem->myFont);
-	int32 fontHeight = gr_font_get_height();
+	const int32 fontHeight = gr_font_get_height();
 	CorrectItemWidthHeight(myItem, fontHeight);
 	if (myItem->myFont != currFont)
 		gr_font_set(currFont);
@@ -1535,7 +1535,7 @@ bool Item_show(Item *i, void *bdrDialog, Buffer *scrBuf, int32 itemType) {
 	Font *currFont = gr_font_get();
 	if (i->myFont != currFont)
 		gr_font_set(i->myFont);
-	int32 fontHeight = gr_font_get_height();
+	const int32 fontHeight = gr_font_get_height();
 
 	gr_color_set(__LTGRAY);
 	gr_buffer_rect_fill(scrBuf, x1, y1, i->w, i->h);
@@ -1780,11 +1780,13 @@ Item *Item_set_next_default(Item *currDefault, Item *itemList) {
 		if (currDefault) {
 			currDefault->status = ITEM_NORMAL;
 		}
-		if (nextDefault->type == TEXTFIELD) {
-			nextDefault->aux = nextDefault->prompt;
-			nextDefault->aux2 = &(nextDefault->prompt[strlen(nextDefault->prompt)]);
+		if (nextDefault) {
+			if (nextDefault->type == TEXTFIELD) {
+				nextDefault->aux = nextDefault->prompt;
+				nextDefault->aux2 = &(nextDefault->prompt[strlen(nextDefault->prompt)]);
+			}
+			nextDefault->status = ITEM_PRESSED;
 		}
-		nextDefault->status = ITEM_PRESSED;
 	}
 	return nextDefault;
 }
@@ -1812,11 +1814,13 @@ Item *Item_set_prev_default(Item *currDefault, Item *listBottom) {
 		if (currDefault) {
 			currDefault->status = ITEM_NORMAL;
 		}
-		if (prevDefault->type == TEXTFIELD) {
-			prevDefault->aux = prevDefault->prompt;
-			prevDefault->aux2 = &(prevDefault->prompt[strlen(prevDefault->prompt)]);
+		if (prevDefault) {
+			if (prevDefault->type == TEXTFIELD) {
+				prevDefault->aux = prevDefault->prompt;
+				prevDefault->aux2 = &(prevDefault->prompt[strlen(prevDefault->prompt)]);
+			}
+			prevDefault->status = ITEM_PRESSED;
 		}
-		prevDefault->status = ITEM_PRESSED;
 	}
 	return prevDefault;
 }