Merge pull request #64 from nextcloud/stable12_63

[stable12] Prevent infinite loop in sabre/xml
nextcloud · Aug 23, 2017 · b7f163f · b7f163f
2 parents e2885e6 + 4c54f25
commit b7f163f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/patches.txt b/patches.txt
@@ -3,3 +3,4 @@ Patches:
 - patchwork/utf8: Remove trigger_error() that spammed the error log
 - Doctrine: fix error handling for not null columns on some mysql servers https://github.com/doctrine/dbal/pull/2422
 - SabreDAV: Make sure that files that are children of directories, are reported as files https://github.com/fruux/sabre-dav/issues/982
+- SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132
diff --git a/sabre/xml/lib/Deserializer/functions.php b/sabre/xml/lib/Deserializer/functions.php
@@ -79,7 +79,9 @@ function keyValue(Reader $reader, $namespace = null) {
                 $values[$clark] = $reader->parseCurrentElement()['value'];
             }
         } else {
-            $reader->read();
+            if (!$reader->read()) {
+                break;
+            }
         }
     } while ($reader->nodeType !== Reader::END_ELEMENT);