Merge pull request #1728 from Wishmaster117/Fix-Opcode-dispatch,-trusts-every-queued-packet-to-have-a-handler

Fix Opcode dispatch, trusts every queued packet to have a handler
Merge pull request #1727 from Wishmaster117/Prevent-Crash-if-sTaxiPathStore.LookupEntry-return-nullptr
2026-02-20 18:10:02 +01:00 · 2025-10-11 13:22:51 +02:00 · 2025-10-11 13:21:51 +02:00 · 2025-10-11 11:26:09 +02:00 · 2025-10-11 10:57:54 +02:00
2 changed files with 9 additions and 0 deletions
--- a/src/PlayerbotMgr.cpp
+++ b/src/PlayerbotMgr.cpp
@ -227,6 +227,12 @@ void PlayerbotHolder::HandleBotPackets(WorldSession* session)
    {
        OpcodeClient opcode = static_cast<OpcodeClient>(packet->GetOpcode());
        ClientOpcodeHandler const* opHandle = opcodeTable[opcode];
+        if (!opHandle)
+        {
+            LOG_ERROR("playerbots", "Unhandled opcode {} queued for bot session {}. Packet dropped.", static_cast<uint32>(opcode), session->GetAccountId());
+            delete packet;
+            continue;
+        }
        opHandle->Call(session, *packet);
        delete packet;
    }
--- a/src/TravelNode.cpp
+++ b/src/TravelNode.cpp
@ -178,6 +178,9 @@ uint32 TravelNodePath::getPrice()

    TaxiPathEntry const* taxiPath = sTaxiPathStore.LookupEntry(pathObject);

+    if (!taxiPath)
+        return 0;
+	
    return taxiPath->price;
 }
Author	SHA1	Message	Date
kadeshar	525eceb5a2	Merge pull request #1728 from Wishmaster117/Fix-Opcode-dispatch,-trusts-every-queued-packet-to-have-a-handler Fix Opcode dispatch, trusts every queued packet to have a handler	2025-10-11 13:22:51 +02:00
kadeshar	bd13d6be80	Merge pull request #1727 from Wishmaster117/Prevent-Crash-if-sTaxiPathStore.LookupEntry-return-nullptr Prevent Crash if sTaxiPathStore.LookupEntry return nullptr	2025-10-11 13:21:51 +02:00
Wishmaster117	d0ac9452f4	Fix Opcode dispatch, trusts every queued packet to have a handler	2025-10-11 11:26:09 +02:00
Wishmaster117	8a30d10617	Prevent Crash if sTaxiPathStore.LookupEntry return nullptr	2025-10-11 10:57:54 +02:00