summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-05 00:00:37 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-05 00:00:37 +0000
commit4f80f6346a5628d842f86cca2f2d7404b3d65530 (patch)
tree2e9af21373cbd4bd61fd18b1894cb8169cf77fb5
parent1e1170ebbbc7c91f341872d333a98e750093556c (diff)
downloadhercules-4f80f6346a5628d842f86cca2f2d7404b3d65530.tar.gz
hercules-4f80f6346a5628d842f86cca2f2d7404b3d65530.tar.bz2
hercules-4f80f6346a5628d842f86cca2f2d7404b3d65530.tar.xz
hercules-4f80f6346a5628d842f86cca2f2d7404b3d65530.zip
* Fixed party booking search increasing result counter, even when no results were found, causing crashes from r14516 onwards (bugreport:4615, since r14412).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14558 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/party.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c75f6759a..d125828bc 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2010/12/04
+ * Fixed party booking search increasing result counter, even when no results were found, causing crashes from r14516 onwards (bugreport:4615, since r14412). [Ai4rei]
2010/12/03
* Fixed soul linkers not receiving taekwon angel buffs upon level up (bugreport:3585, since r3657 and r3660, related r6294). [Ai4rei]
* Corrected 'chance' in description for bonuses bAddMonsterDropItem and bAddMonsterDropItemGroup (bugreport:4063, partially since r1572). [Ai4rei]
diff --git a/src/map/party.c b/src/map/party.c
index cb83a36bb..407221cde 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -1147,7 +1147,10 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
if (pb_ad->p_detail.mapid == mapid)
result_list[count] = pb_ad;
}
- count++;
+ if( result_list[count] )
+ {
+ count++;
+ }
}
iter->destroy(iter);
clif_PartyBookingSearchAck(sd->fd, result_list, count, more_result);