From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 8 Apr 2019 11:21:46 +0000 (+0200)
Subject: Harden appdata putcontent
X-Git-Tag: v16.0.0RC1~18^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d360bd16f345e395f7650998e8ee4a5d252c2b5;p=nextcloud-server.git

Harden appdata putcontent

If for whatever reason appdata got into a strange state this will at
least propegate up and not make it do boom the next run.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---

diff --git a/lib/private/Files/SimpleFS/SimpleFile.php b/lib/private/Files/SimpleFS/SimpleFile.php
index 7b83e9372f7..9c9ca10650c 100644
--- a/lib/private/Files/SimpleFS/SimpleFile.php
+++ b/lib/private/Files/SimpleFS/SimpleFile.php
@@ -99,9 +99,14 @@ class SimpleFile implements ISimpleFile  {
 	 *
 	 * @param string|resource $data
 	 * @throws NotPermittedException
+	 * @throws NotFoundException
 	 */
 	public function putContent($data) {
-		$this->file->putContent($data);
+		try {
+			return $this->file->putContent($data);
+		} catch (NotFoundException $e) {
+			$this->checkFile();
+		}
 	}
 
 	/**
@@ -119,7 +124,11 @@ class SimpleFile implements ISimpleFile  {
 
 		while ($cur->stat() === false) {
 			$parent = $cur->getParent();
-			$cur->delete();
+			try {
+				$cur->delete();
+			} catch (NotFoundException $e) {
+				// Just continue then
+			}
 			$cur = $parent;
 		}
 
diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php
index a3cd3245cc7..b00f5c482c6 100644
--- a/lib/public/Files/SimpleFS/ISimpleFile.php
+++ b/lib/public/Files/SimpleFS/ISimpleFile.php
@@ -80,6 +80,7 @@ interface ISimpleFile {
 	 *
 	 * @param string|resource $data
 	 * @throws NotPermittedException
+	 * @throws NotFoundException
 	 * @since 11.0.0
 	 */
 	public function putContent($data);