@@ -106,19 +106,18 @@ class plistParser extends XMLReader $this->nextOfType(XMLReader::ELEMENT); $array[$key] = $this->parse_node(); $this->nextOfType(XMLReader::ELEMENT, XMLReader::END_ELEMENT); - } while(!$this->isNodeOfTypeName(XMLReader::END_ELEMENT, "dict")); + } while($this->nodeType && !$this->isNodeOfTypeName(XMLReader::END_ELEMENT, "dict")); return $array; } private function parse_array() { $array = array(); + $this->nextOfType(XMLReader::ELEMENT); do { - // find the first item of the array and append it onto the node list - $this->nextOfType(XMLReader::ELEMENT); $array[] = $this->parse_node(); // skip over any whitespace $this->nextOfType(XMLReader::ELEMENT, XMLReader::END_ELEMENT); - } while(!$this->isNodeOfTypeName(XMLReader::END_ELEMENT, "array")); + } while($this->nodeType && !$this->isNodeOfTypeName(XMLReader::END_ELEMENT, "array")); return $array; } @@ -134,7 +133,7 @@ class plistParser extends XMLReader // skip to next $this->read(); // check if it's one of the types requested and loop until it's one we want - while(!(in_array($this->nodeType, $types))) { + while($this->nodeType && !(in_array($this->nodeType, $types))) { // node isn't of type requested, so keep going $this->read(); } classes/parsers/plist/PlistParser.inc f01a65a8eecb34cb84be4c0a6064e4bb4216958c Jonty jonty@jonty.co.uk http://github.com/jsjohnst/php_class_lib/commit/0371782ca8aef1152baddca57808c98e84a91ecc 0371782ca8aef1152baddca57808c98e84a91ecc 2009-09-05T16:45:57-07:00 2009-09-05T11:24:54-07:00 Fixes various infinite loops on heavily nested plists, fixes a logic bug in nested array/dict handling that lead to incorrect nesting. Signed-off-by: Jeremy Johnstone <github@jeremyjohnstone.com> 6c046394c0fa6d6e1fde68244589158054d0d2e6 Jeremy Johnstone github@jeremyjohnstone.com