From: Jaakko Salo <jaakkos@gmail.com>
Date: Sun, 24 May 2020 00:19:04 +0000 (+0300)
Subject: Fix releasing a shared lock multiple times
X-Git-Tag: v20.0.0beta1~308^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b7dd278e24685fbec34a95b797c204f4a1d53064;p=nextcloud-server.git

Fix releasing a shared lock multiple times

Signed-off-by: Jaakko Salo <jaakkos@gmail.com>
---

diff --git a/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php
index 3d7510f43ff..bff4eabbbd8 100644
--- a/lib/private/Lock/MemcacheLockingProvider.php
+++ b/lib/private/Lock/MemcacheLockingProvider.php
@@ -94,8 +94,12 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
 	 */
 	public function releaseLock(string $path, int $type) {
 		if ($type === self::LOCK_SHARED) {
+			$ownSharedLockCount = $this->getOwnSharedLockCount($path);
 			$newValue = 0;
-			if ($this->getOwnSharedLockCount($path) === 1) {
+			if ($ownSharedLockCount === 0) { // if we are not holding the lock, don't try to release it
+				return;
+			}
+			if ($ownSharedLockCount === 1) {
 				$removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
 				if (!$removed) { //someone else also has a shared lock, decrease only
 					$newValue = $this->memcache->dec($path);