From 98464617e78eea12f2ac231e82ac5c3b07412fa5 Mon Sep 17 00:00:00 2001
From: Bjﾃｸrn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 9 Mar 2009 14:05:00 +0100
Subject: Fixes for some character server crashes

Patch by MadCamel.
---
 src/char/char.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/char')

diff --git a/src/char/char.c b/src/char/char.c
index df839ff..2719c03 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2455,7 +2455,7 @@ int parse_char(int fd) {
 			break;
 
 		case 0x66:	// キャラ選択
-			if (RFIFOREST(fd) < 3)
+			if (!sd || RFIFOREST(fd) < 3)
 				return 0;
 
 			// if we activated email creation and email is default email
@@ -2553,7 +2553,7 @@ int parse_char(int fd) {
 			break;
 
 		case 0x67:	// 作成
-			if (RFIFOREST(fd) < 37)
+			if (!sd || RFIFOREST(fd) < 37)
 				return 0;
 			i = make_new_char(fd, RFIFOP(fd,2));
 			if (i < 0) {
@@ -2613,7 +2613,7 @@ int parse_char(int fd) {
 			}
 
 		case 0x68:	// delete char //Yor's Fix
-			if (RFIFOREST(fd) < 46)
+			if (!sd || RFIFOREST(fd) < 46)
 				return 0;
 			memcpy(email, RFIFOP(fd,6), 40);
 			if (e_mail_check(email) == 0)
-- 
cgit v1.2.3-60-g2f50