From df3f2db7ea53161de7da6df2b5d2ac7a5350c716 Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 26 Sep 2016 06:20:40 +0000 Subject: [PATCH] Make say handling short out earlier to prevent runtimes The code does not appear to expect a message of the form "", but does not carry out the check for a message until much later --- code/modules/mob/living/say.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 59ab34a98eb..a9ada9e2f5f 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -60,6 +60,9 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN) /mob/living/say(message, bubble_type,var/list/spans = list()) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) + if(!message || message == "") + return + if(stat == DEAD) say_dead(message) @@ -93,9 +96,6 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN) if(message_mode != MODE_WHISPER) //whisper() calls treat_message(); double process results in "hisspering" message = treat_message(message) - if(!message) - return - spans += get_spans() //Log of what we've said, plain message, no spans or junk