From f4758b757061ed0107266d9d988352270200a3f1 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 10 Feb 2021 00:27:04 +0900
Subject: [PATCH] Fix #1610 memory leak in initial debug status check

---
 common/framework/debug.php                 | 4 ++--
 common/framework/helpers/sessionhelper.php | 7 +++----
 common/framework/session.php               | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/common/framework/debug.php b/common/framework/debug.php
index 31494f4c2..ef28859f3 100644
--- a/common/framework/debug.php
+++ b/common/framework/debug.php
@@ -745,9 +745,9 @@ class Debug
 			
 			case 'admin':
 			default:
-				if (Session::isStarted())
+				if ($logged_info = \Context::get('logged_info'))
 				{
-					return self::$_enabled = Session::isAdmin();
+					return self::$_enabled = $logged_info->isAdmin();
 				}
 				else
 				{
diff --git a/common/framework/helpers/sessionhelper.php b/common/framework/helpers/sessionhelper.php
index 6dd640627..5be05d8d3 100644
--- a/common/framework/helpers/sessionhelper.php
+++ b/common/framework/helpers/sessionhelper.php
@@ -27,8 +27,7 @@ class SessionHelper
 		$member_srl = intval($member_srl);
 		if ($member_srl)
 		{
-			$oMemberModel = \MemberModel::getInstance();
-			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+			$member_info = \MemberModel::getMemberInfo($member_srl);
 			if (isset($member_info->member_srl) && intval($member_info->member_srl) === $member_srl)
 			{
 				foreach (get_object_vars($member_info) as $key => $value)
@@ -36,7 +35,7 @@ class SessionHelper
 					$this->{$key} = $value;
 				}
 				$this->member_srl = $member_srl;
-				$this->group_list = $oMemberModel->getMemberGroups($member_srl);
+				$this->group_list = \MemberModel::getMemberGroups($member_srl);
 			}
 		}
 	}
@@ -69,7 +68,7 @@ class SessionHelper
 	 */
 	public function isModuleAdmin($module_srl = null)
 	{
-		return $this->is_admin === 'Y' || \ModuleModel::getInstance()->isModuleAdmin($this, $module_srl);
+		return $this->is_admin === 'Y' || \ModuleModel::isModuleAdmin($this, $module_srl);
 	}
 	
 	/**
diff --git a/common/framework/session.php b/common/framework/session.php
index dd67b451c..123ef476a 100644
--- a/common/framework/session.php
+++ b/common/framework/session.php
@@ -315,7 +315,7 @@ class Session
 		{
 			$current_domain = $site_module_info->domain;
 			$current_url = URL::getCurrentUrl();
-			$default_domain = \ModuleModel::getInstance()->getDefaultDomainInfo();
+			$default_domain = \ModuleModel::getDefaultDomainInfo();
 			$default_url = \Context::getDefaultUrl($default_domain);
 		}
 		
@@ -700,7 +700,7 @@ class Session
 		}
 		
 		// Check member information to see if denied or limited.
-		$member_info = \MemberModel::getInstance()->getMemberInfoByMemberSrl($member_srl);
+		$member_info = \MemberModel::getMemberInfo($member_srl);
 		if ($member_info->denied === 'Y')
 		{
 			trigger_error('Session is invalid for member_srl=' . intval($_SESSION['RHYMIX']['login']) . ' (denied)', \E_USER_WARNING);