From d0e40c1c6dcd7ac046eb45cecd405ced0fc1c63e Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Mon, 30 Aug 2021 19:28:10 +0900
Subject: [PATCH] Fix a bug in M command + quoted string

---
 src/sys/nact_sys2.cpp | 4 ++--
 src/sys/nact_sys3.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sys/nact_sys2.cpp b/src/sys/nact_sys2.cpp
index f3b8a58..5fc8bcd 100644
--- a/src/sys/nact_sys2.cpp
+++ b/src/sys/nact_sys2.cpp
@@ -850,12 +850,12 @@ void NACT_Sys2::cmd_l()
 void NACT_Sys2::cmd_m()
 {
 	char string[33];
-	int p = 0;
 
 	int d = getd();
 	if (d == '\'' || d == '"') {  // SysEng
 		get_string(string, sizeof(string), d);
 	} else {
+		int p = 0;
 		while(d != ':') {
 			if(is_2byte_message(d)) {
 				string[p++] = d;
@@ -865,8 +865,8 @@ void NACT_Sys2::cmd_m()
 			}
 			d = getd();
 		}
+		string[p] = '\0';
 	}
-	string[p] = '\0';
 
 	output_console("\nM %s:", string);
 
diff --git a/src/sys/nact_sys3.cpp b/src/sys/nact_sys3.cpp
index 774cf72..f1fd37d 100644
--- a/src/sys/nact_sys3.cpp
+++ b/src/sys/nact_sys3.cpp
@@ -708,12 +708,12 @@ void NACT_Sys3::cmd_l()
 void NACT_Sys3::cmd_m()
 {
 	char string[22];
-	int p = 0;
 
 	int d = getd();
 	if (d == '\'' || d == '"') {  // SysEng
 		get_string(string, sizeof(string), d);
 	} else {
+		int p = 0;
 		while(d != ':') {
 			if(is_2byte_message(d)) {
 				string[p++] = d;
@@ -723,8 +723,8 @@ void NACT_Sys3::cmd_m()
 			}
 			d = getd();
 		}
+		string[p] = '\0';
 	}
-	string[p] = '\0';
 
 	output_console("\nM %s:", string);