From 26acd8a5e43f6fc697728f04f4966b26bbd05230 Mon Sep 17 00:00:00 2001 From: Vishal Pandey Date: Tue, 14 Mar 2017 00:57:28 +0530 Subject: [ticket/11515] Extra check after acquiring locks. Add additional check to flock.php and db.php to ensure lock aquiring. PHPBB3-11515 --- phpBB/phpbb/lock/flock.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'phpBB/phpbb/lock/flock.php') diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index df88e1490a..89ff7cbe48 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -101,7 +101,12 @@ class flock if ($this->lock_fp) { - @flock($this->lock_fp, LOCK_EX); + if (@flock($this->lock_fp, LOCK_EX)) + { + return (bool) $this->lock_fp; + } else { + throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); + } } return (bool) $this->lock_fp; -- cgit v1.2.1 From 530e5bca87758342bfe0f212191ace8a709bdb75 Mon Sep 17 00:00:00 2001 From: Vishal Pandey Date: Tue, 14 Mar 2017 02:16:18 +0530 Subject: [ticket/11515] Change If...else statement struct Modifications in if-else structure. PHPBB3-11515 --- phpBB/phpbb/lock/flock.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/phpbb/lock/flock.php') diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index 89ff7cbe48..b496ed845e 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -104,7 +104,9 @@ class flock if (@flock($this->lock_fp, LOCK_EX)) { return (bool) $this->lock_fp; - } else { + } + else + { throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); } } -- cgit v1.2.1 From 7d4909dc064b46022020234c7316c86fc0d38a69 Mon Sep 17 00:00:00 2001 From: Vishal Pandey Date: Tue, 14 Mar 2017 17:19:41 +0530 Subject: [ticket/11515] Refactoring the patch. Removing else conditions. PHPBB3-11515 --- phpBB/phpbb/lock/flock.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'phpBB/phpbb/lock/flock.php') diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index b496ed845e..fa4cbe3690 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -105,10 +105,7 @@ class flock { return (bool) $this->lock_fp; } - else - { - throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); - } + throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); } return (bool) $this->lock_fp; -- cgit v1.2.1 From dfcce400a44591fd610de400818b3d6af988104e Mon Sep 17 00:00:00 2001 From: Vishal Pandey Date: Sun, 14 May 2017 11:47:48 +0530 Subject: [ticket/11515] Inverted Logic Inverted the logic to raise exception inside if. PHPBB3-11515 --- phpBB/phpbb/lock/flock.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/phpbb/lock/flock.php') diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index fa4cbe3690..6c41ceed26 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -101,11 +101,11 @@ class flock if ($this->lock_fp) { - if (@flock($this->lock_fp, LOCK_EX)) + if (!@flock($this->lock_fp, LOCK_EX)) { - return (bool) $this->lock_fp; + throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); } - throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); + return (bool) $this->lock_fp; } return (bool) $this->lock_fp; -- cgit v1.2.1 From 332b310809083df34e4eaa0df5dbbf73b171ec25 Mon Sep 17 00:00:00 2001 From: Vishal Pandey Date: Sun, 14 May 2017 12:08:20 +0530 Subject: [ticket/11515] If condition changes Duplicate return statements removed. PHPBB3-11515 --- phpBB/phpbb/lock/flock.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/phpbb/lock/flock.php') diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php index 6c41ceed26..af051afb56 100644 --- a/phpBB/phpbb/lock/flock.php +++ b/phpBB/phpbb/lock/flock.php @@ -105,7 +105,6 @@ class flock { throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.'); } - return (bool) $this->lock_fp; } return (bool) $this->lock_fp; -- cgit v1.2.1