Merge pull request #63 from nextcloud/sabre-xml-132

Prevent infinite loop in sabre/xml
nextcloud · Aug 22, 2017 · 8b3251a · 8b3251a
2 parents 4b60f9e + 06f6a06
commit 8b3251a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/patches.txt b/patches.txt
@@ -5,3 +5,4 @@ Patches:
 - SabreDAV: Make sure that files that are children of directories, are reported as files https://github.com/fruux/sabre-dav/issues/982
 - SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128
 - php-opencloud: Fix invalid PHP docs https://github.com/rackspace/php-opencloud/pull/711
+- 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);