[Scummvm-git-logs] scummvm master -> 11c61bf783821737e73c447d84766d4136d5e115

dreammaster dreammaster at scummvm.org
Thu Apr 15 01:30:33 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:
11c61bf783 AGS: Change string check for <4096 to be just for null


Commit: 11c61bf783821737e73c447d84766d4136d5e115
    https://github.com/scummvm/scummvm/commit/11c61bf783821737e73c447d84766d4136d5e115
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-04-14T18:30:29-07:00

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

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 4300803a95..ba554a3340 100644
--- a/engines/ags/engine/ac/string.h
+++ b/engines/ags/engine/ac/string.h
@@ -28,7 +28,7 @@
 namespace AGS3 {
 
 // Check that a supplied buffer from a text script function was not null
-#define VALIDATE_STRING(strin) if (reinterpret_cast<intptr_t>(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