Merge tag 'v14.4.19'

Conflicts:
	CHANGELOG

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6579ef1..714fef1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@ v14.6.30:
   - drop gcc 4.6 support
   - completely remove flex/bison dependency
   - fix duplication in npctalk
+v14.4.19:
+  - emergency backport of security fix, since v14.7.1 is too buggy
 v14.4.18:
   - fix some fatal bugs related to logout in the previous release
   - fix out-of-bounds in trades exposed in the previous commit
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 1e31af9..b9cf17b 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -2673,7 +2673,8 @@ void parse_char(Session *s)
                         {
                             if (cd.key.char_id == cid)
                             {
-                                cs = &cd;
+                                if (cd.key.account_id == sd->account_id)
+                                    cs = &cd;
                                 break;
                             }
                         }