mirrors/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2025-08-05 23:25:53 +02:00
Code Activity

Merge pull request #303 from otavepto/patch/chat-1

Browse source 
Avoid sending chat entry ID = 0 in `GetLobbyChatEntry()`
This commit is contained in:
Detanup01 2025-07-27 21:29:45 +02:00 • committed by GitHub
commit 02477b8f15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
dll/steam_matchmaking.cpp
View file

@ -1005,14 +1005,23 @@ int Steam_Matchmaking::GetLobbyChatEntry( CSteamID steamIDLobby, int iChatID, ST
{ {
PRINT_DEBUG("%llu %i %p %p %i %p", steamIDLobby.ConvertToUint64(), iChatID, pSteamIDUser, pvData, cubData, peChatEntryType); PRINT_DEBUG("%llu %i %p %p %i %p", steamIDLobby.ConvertToUint64(), iChatID, pSteamIDUser, pvData, cubData, peChatEntryType);
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
if (iChatID < 0 || cubData < 0 || static_cast<size_t>(iChatID) >= chat_entries.size()) return 0;
if (chat_entries[iChatID].lobby_id != steamIDLobby) return 0; if (pSteamIDUser) *pSteamIDUser = k_steamIDNil;
if (pSteamIDUser) *pSteamIDUser = chat_entries[iChatID].user_id; if (peChatEntryType) *peChatEntryType = EChatEntryType::k_EChatEntryTypeInvalid;
if (peChatEntryType) *peChatEntryType = chat_entries[iChatID].type;
if (iChatID <= 0 || cubData < 0 || static_cast<size_t>(iChatID) > chat_entries.size()) return 0;
Chat_Entry &chat_entry = chat_entries[iChatID - 1];
if (pSteamIDUser) *pSteamIDUser = chat_entry.user_id;
if (peChatEntryType) *peChatEntryType = chat_entry.type;
if (chat_entry.lobby_id != steamIDLobby) return 0;
if (pvData) { if (pvData) {
if (chat_entries[iChatID].message.size() <= static_cast<size_t>(cubData)) { if (chat_entry.message.size() <= static_cast<size_t>(cubData)) {
cubData = static_cast<int>(chat_entries[iChatID].message.size()); cubData = static_cast<int>(chat_entry.message.size());
memcpy(pvData, chat_entries[iChatID].message.data(), cubData); memcpy(pvData, chat_entry.message.data(), cubData);
PRINT_DEBUG(" Returned chat of len: %i", cubData); PRINT_DEBUG(" Returned chat of len: %i", cubData);
return cubData; return cubData;
} }
@ -1681,23 +1690,30 @@ void Steam_Matchmaking::Callback(Common_Message *msg)
if (msg->lobby_messages().type() == Lobby_Messages::CHAT_MESSAGE) { if (msg->lobby_messages().type() == Lobby_Messages::CHAT_MESSAGE) {
PRINT_DEBUG("LOBBY MESSAGE: CHAT MESSAGE"); PRINT_DEBUG("LOBBY MESSAGE: CHAT MESSAGE");
EChatEntryType entry_type = EChatEntryType::k_EChatEntryTypeChatMsg;
if (we_are_in_lobby) { if (we_are_in_lobby) {
{
struct Chat_Entry entry{}; struct Chat_Entry entry{};
entry.type = k_EChatEntryTypeChatMsg; entry.type = entry_type;
entry.message = msg->lobby_messages().bdata(); entry.message = msg->lobby_messages().bdata();
entry.lobby_id = CSteamID((uint64)msg->lobby_messages().id()); entry.lobby_id = CSteamID((uint64)msg->lobby_messages().id());
entry.user_id = CSteamID((uint64)msg->source_id()); entry.user_id = CSteamID((uint64)msg->source_id());
chat_entries.push_back(entry);
}
{
LobbyChatMsg_t data{}; LobbyChatMsg_t data{};
data.m_ulSteamIDLobby = msg->lobby_messages().id(); data.m_ulSteamIDLobby = msg->lobby_messages().id();
data.m_ulSteamIDUser = msg->source_id(); data.m_ulSteamIDUser = msg->source_id();
data.m_eChatEntryType = entry.type; data.m_eChatEntryType = entry_type;
data.m_iChatID = static_cast<uint32>(chat_entries.size()); data.m_iChatID = static_cast<uint32>(chat_entries.size()); // avoid ID=0 since most steam APIs use that as a notation for error
chat_entries.push_back(entry);
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data)); callbacks->addCBResult(data.k_iCallback, &data, sizeof(data));
} }
} }
} }
} }
}
if (msg->has_low_level()) { if (msg->has_low_level()) {
if (msg->low_level().type() == Low_Level::CONNECT) { if (msg->low_level().type() == Low_Level::CONNECT) {