summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-05 04:50:41 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-05 04:50:41 +0000
commit1e6f493eab41de9a948314c3e1ba4f2e9d9df4d2 (patch)
treecda2adb1714c257e011463af26aff6a33761dfd3
parentc7c084a2111cf5fe0ed781c524acabfecee42030 (diff)
downloadhercules-1e6f493eab41de9a948314c3e1ba4f2e9d9df4d2.tar.gz
hercules-1e6f493eab41de9a948314c3e1ba4f2e9d9df4d2.tar.bz2
hercules-1e6f493eab41de9a948314c3e1ba4f2e9d9df4d2.tar.xz
hercules-1e6f493eab41de9a948314c3e1ba4f2e9d9df4d2.zip
updates
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@452 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--src/map/clif.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index c5786f39f..2d72fc81b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
12/4
+ * Fixed a crash in clif_send when player disconnects but player
+ object is not fully removed from map [MouseJstr]
* Fixed a crash associated with NPC_BARRIER [MouseJstr]
* Renamed flush_fifos_at_exit to flush_fifos [MouseJstr]
* call check_connect_char_server() on char_server disconnect [MouseJstr]
diff --git a/src/map/clif.c b/src/map/clif.c
index 79ca0e227..bcccadfab 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -256,7 +256,7 @@ int clif_send_sub(struct block_list *bl, va_list ap)
break;
}
- if (sd) {
+ if ((sd != NULL) && (session[sd->fd] != NULL)) {
if (WFIFOP(sd->fd,0) == buf) {
printf("WARNING: Invalid use of clif_send function\n");
printf(" Packet x%4x use a WFIFO of a player instead of to use a buffer.\n", WBUFW(buf,0));