2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f91489e..4ec5e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+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 8a3397d..f8e12c0 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -2410,7 +2410,8 @@ void parse_char(Session *s)
                         {
                             if (cd.key.char_id == RFIFOL(s, 2))
                             {
-                                cs = &cd;
+                                if (cd.key.account_id == sd->account_id)
+                                    cs = &cd;
                                 break;
                             }
                         }