From 9b3b068f5f2951238a470c535e038495a54383a3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 9 Aug 2016 23:02:25 +0300 Subject: Fix login and char servers null pointer access if packet handler in plugin initiate server termination. --- src/char/char.c | 5 ++++- src/login/login.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/char/char.c b/src/char/char.c index 9275678e6..51411791e 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3807,8 +3807,11 @@ int char_parse_frommap(int fd) int packet_id = RFIFOW(fd,0); if (VECTOR_LENGTH(HPM->packets[hpParse_FromMap]) > 0) { int result = HPM->parse_packets(fd,packet_id,hpParse_FromMap); - if (result == 1) + if (result == 1) { + if (sockt->session[fd] == NULL) + return 0; continue; + } if (result == 2) return 0; } diff --git a/src/login/login.c b/src/login/login.c index 7f5f78a4d..6b422eef2 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -817,8 +817,11 @@ int login_parse_fromchar(int fd) if (VECTOR_LENGTH(HPM->packets[hpParse_FromChar]) > 0) { int result = HPM->parse_packets(fd,command,hpParse_FromChar); - if (result == 1) + if (result == 1) { + if (sockt->session[fd] == NULL) + return 0; continue; + } if (result == 2) return 0; } -- cgit v1.2.3-60-g2f50