fix(zscript): sanity check for bitmap->isValid() and bitmap->isAlloca…

…ted()
ZQuestClassic · Jan 16, 2024 · c07f28f · c07f28f
1 parent 377981e
commit c07f28f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/zc/ffscript.cpp b/src/zc/ffscript.cpp
@@ -41585,7 +41585,7 @@ void FFScript::do_isvalidbitmap()
 	int32_t UID = get_register(sarg1);
 	//zprint("isValidBitmap() bitmap pointer value is %d\n", UID);
 	if ( UID <= 0 ) set_register(sarg1, 0); 
-	else if ( scb.script_created_bitmaps[UID-10].u_bmp ) 
+	else if ( UID-10>=0 && UID-10 < 256 && scb.script_created_bitmaps[UID-10].u_bmp )
 		set_register(sarg1, 10000);
 	else set_register(sarg1, 0);
 }
@@ -41596,7 +41596,7 @@ void FFScript::do_isallocatedbitmap()
 	if ( UID <= 0 ) set_register(sarg1, 0); 
 	else
 	{
-		set_register(sarg1, (scb.script_created_bitmaps[UID-10].reserved()) ? 10000L : 0L);
+		set_register(sarg1, (UID-10>=0 && UID-10 < 256 && scb.script_created_bitmaps[UID-10].reserved()) ? 10000L : 0L);
 		/*
 		UID-=10;
 		if ( UID <= highest_valid_user_bitmap() || UID < firstUserGeneratedBitmap)