From 6fac3210f0de07ab1ff483875ac517a3eea7367a Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Sun, 24 Apr 2016 13:46:11 -0400
Subject: check for null pointer where npc_dialog_mes is used

---
 src/map/script-fun.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/map')

diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index fc555ad..b73a8fc 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -90,6 +90,8 @@ static
 void builtin_mes(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    if (sd == nullptr)
+        return;
     sd->state.npc_dialog_mes = 1;
     RString mes = HARG(0) ? conv_str(st, &AARG(0)) : ""_s;
     clif_scriptmes(sd, st->oid, mes);
@@ -327,6 +329,8 @@ void builtin_close(ScriptState *st)
     }
     st->state = ScriptEndState::END;
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    if (sd == nullptr)
+        return;
     if (sd->state.npc_dialog_mes)
         clif_scriptclose(sd, st->oid);
     else
@@ -338,6 +342,8 @@ void builtin_close2(ScriptState *st)
 {
     st->state = ScriptEndState::STOP;
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    if (sd == nullptr)
+        return;
     if (sd->state.npc_dialog_mes)
         clif_scriptclose(sd, st->oid);
     else
-- 
cgit v1.2.3-70-g09d2