[Scummvm-git-logs] scummvm master -> 29e9cdc40f5bfeebdd98388041a21f35036431f0

[aquadran]

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:
29e9cdc40f GRIM: Fix string comparison in lua


Commit: 29e9cdc40f5bfeebdd98388041a21f35036431f0
    https://github.com/scummvm/scummvm/commit/29e9cdc40f5bfeebdd98388041a21f35036431f0
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-06-05T22:10:19+02:00

Commit Message:
GRIM: Fix string comparison in lua

Reported by GCC 12:

lobject.cpp: In function 'int32 Grim::luaO_equalObj(TObject*, TObject*)':
lobject.cpp:51:35: warning: comparison between two arrays [-Warray-compare]
   51 |                 return svalue(t1) == svalue(t2);

Upstream fix: https://github.com/lua/lua/commit/84790bb953a091eed06d260ef58e71987dda3dab

Changed paths:
    engines/grim/lua/lobject.cpp


diff --git a/engines/grim/lua/lobject.cpp b/engines/grim/lua/lobject.cpp
index 26478ffbad0..d158cc51eb2 100644
--- a/engines/grim/lua/lobject.cpp
+++ b/engines/grim/lua/lobject.cpp
@@ -48,7 +48,7 @@ int32 luaO_equalObj(TObject *t1, TObject *t2) {
 	case LUA_T_USERDATA:
 		return (t1->value.ud.id == t2->value.ud.id && t1->value.ud.tag == t2->value.ud.tag);
 	case LUA_T_STRING:
-		return svalue(t1) == svalue(t2);
+		return tsvalue(t1) == tsvalue(t2);
 	case LUA_T_ARRAY:
 		return avalue(t1) == avalue(t2);
 	case LUA_T_PROTO: