Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable12] Prevent infinite loop in sabre/xml #64

Merged
merged 1 commit into from
Aug 23, 2017
Merged

[stable12] Prevent infinite loop in sabre/xml #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions patches.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion sabre/xml/lib/Deserializer/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down