From 3a525b8345cdb786aa4c015382d88ee2dcc44407 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Mon, 25 Apr 2022 14:26:03 +0200 Subject: [PATCH] fix(Core): Crashfix. (#11495) --- src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index e31fd234c..7d6985a7c 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -731,6 +731,9 @@ bool AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player { uint32 itrcounter = 0; + // Ensures that listfrom is not greater that auctions count + listfrom = std::min(listfrom, static_cast(GetAuctions().size())); + std::vector auctionShortlist; // pussywizard: optimization, this is a simplified case @@ -880,8 +883,13 @@ bool AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player } } + if (auctionShortlist.empty()) + { + return true; + } + // Check if sort enabled, and first sort column is valid, if not don't sort - if (sortOrder.size() > 0) + if (!sortOrder.empty()) { AuctionSortInfo const& sortInfo = *sortOrder.begin(); if (sortInfo.sortOrder >= AUCTION_SORT_MINLEVEL && sortInfo.sortOrder < AUCTION_SORT_MAX && sortInfo.sortOrder != AUCTION_SORT_UNK4)