Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errors

Assert that there are no xml error left

3 files changed, 4 insertions, 0 deletions

diff --git a/lib/private/app/infoparser.php b/lib/private/app/infoparser.php
index 22f705884bc..a84163612e8 100644
--- a/lib/private/app/infoparser.php
+++ b/lib/private/app/infoparser.php
@@ -59,6 +59,7 @@ class InfoParser {
 		$xml = simplexml_load_file($file);
 		libxml_disable_entity_loader($loadEntities);
 		if ($xml == false) {
+			libxml_clear_errors();
 			return null;
 		}
 		$array = $this->xmlToArray($xml);
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index e2973f82605..81c9abee058 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -97,6 +97,7 @@ class OCSClient {
 		libxml_disable_entity_loader($loadEntities);
 
 		if($data === false) {
+			libxml_clear_errors();
 			$this->logger->error(
 				sprintf('Could not get %s, content was no valid XML', $action),
 				[
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 366ad2555a8..d5598d339d3 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -177,6 +177,8 @@ class Updater extends BasicEmitter {
 				$tmp['versionstring'] = (string)$data->versionstring;
 				$tmp['url'] = (string)$data->url;
 				$tmp['web'] = (string)$data->web;
+			} else {
+				libxml_clear_errors();
 			}
 		} else {
 			$data = [];