[Scummvm-git-logs] scummvm master -> 930d88dc462120ecded9a395cd9011ac60988f09

criezy criezy at scummvm.org
Mon Jun 14 10:40:09 UTC 2021


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

Summary:
930d88dc46 AGS: Change string check for <4096 to be just for null


Commit: 930d88dc462120ecded9a395cd9011ac60988f09
    https://github.com/scummvm/scummvm/commit/930d88dc462120ecded9a395cd9011ac60988f09
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-06-14T11:39:19+01:00

Commit Message:
AGS: Change string check for <4096 to be just for null

On some platform we get valid pointers < 4096.

Changed paths:
    engines/ags/engine/ac/string.h


diff --git a/engines/ags/engine/ac/string.h b/engines/ags/engine/ac/string.h
index a8bda95eea..46740ea7f7 100644
--- a/engines/ags/engine/ac/string.h
+++ b/engines/ags/engine/ac/string.h
@@ -29,7 +29,7 @@
 namespace AGS3 {
 
 // Check that a supplied buffer from a text script function was not null
-#define VALIDATE_STRING(strin) if ((unsigned long)strin <= 4096) quit("!String argument was null: make sure you pass a string, not an int, as a buffer")
+#define VALIDATE_STRING(strin) if (!strin) quit("!String argument was null: make sure you pass a string buffer")
 
 int String_IsNullOrEmpty(const char *thisString);
 const char *String_Copy(const char *srcString);




More information about the Scummvm-git-logs mailing list