Let loadstring & load load UTF-8 strings with BOM

qaisjp · ccw808 · commit 697bb3207ae5 · 2016-01-12T22:21:13.000Z
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Resource.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Resource.cpp
@@ -441,6 +441,7 @@ int CLuaFunctionDefs::LoadString( lua_State* luaVM )
 
         if ( !argStream.HasErrors() )
         {
+            CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
             if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )
             {
                 // Ok
@@ -513,6 +514,7 @@ int CLuaFunctionDefs::Load( lua_State* luaVM )
 
         if ( !argStream.HasErrors() )
         {
+            CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
             if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )
             {
                 // Ok
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
@@ -1307,6 +1307,7 @@ int CLuaResourceDefs::LoadString( lua_State* luaVM )
 
         if ( !argStream.HasErrors() )
         {
+            CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
             if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )
             {
                 // Ok
@@ -1379,6 +1380,7 @@ int CLuaResourceDefs::Load( lua_State* luaVM )
 
         if ( !argStream.HasErrors() )
         {
+            CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
             if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )
             {
                 // Ok

Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,7 @@ int CLuaFunctionDefs::LoadString( lua_State* luaVM )`
`441`	`441`
`442`	`442`	`if ( !argStream.HasErrors() )`
`443`	`443`	`{`
	`444`	`+ CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );`
`444`	`445`	`if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )`
`445`	`446`	`{`
`446`	`447`	`// Ok`
`@@ -513,6 +514,7 @@ int CLuaFunctionDefs::Load( lua_State* luaVM )`
`513`	`514`
`514`	`515`	`if ( !argStream.HasErrors() )`
`515`	`516`	`{`
	`517`	`+ CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );`
`516`	`518`	`if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )`
`517`	`519`	`{`
`518`	`520`	`// Ok`
Original file line number	Diff line number	Diff line change
`@@ -1307,6 +1307,7 @@ int CLuaResourceDefs::LoadString( lua_State* luaVM )`
`1307`	`1307`
`1308`	`1308`	`if ( !argStream.HasErrors() )`
`1309`	`1309`	`{`
	`1310`	`+ CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );`
`1310`	`1311`	`if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )`
`1311`	`1312`	`{`
`1312`	`1313`	`// Ok`
`@@ -1379,6 +1380,7 @@ int CLuaResourceDefs::Load( lua_State* luaVM )`
`1379`	`1380`
`1380`	`1381`	`if ( !argStream.HasErrors() )`
`1381`	`1382`	`{`
	`1383`	`+ CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );`
`1382`	`1384`	`if ( !CLuaMain::LuaLoadBuffer( luaVM, cpBuffer, uiSize, szChunkname ) )`
`1383`	`1385`	`{`
`1384`	`1386`	`// Ok`