Log this specific protocol error.

horde · Jun 1, 2015 · 91c53c5 · 91c53c5
1 parent b677080
commit 91c53c5
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
@@ -750,6 +750,15 @@ protected function _parseSyncFolders()
 
                 case Horde_ActiveSync::SYNC_FOLDERID:
                     $collection['id'] = $this->_decoder->getElementContent();
+                    if ($collection['id'] === false) {
+                        // Log this case explicitly since we can't send back
+                        // a protocol error status (the response requires a
+                        // collection id and we obviously don't have one).
+                        $this->_logger->err(sprintf(
+                            '[%s] PROTOCOL ERROR. Client sent an empty SYNC_FOLDERID value.',
+                            $this->_procid));
+                        throw new Horde_ActiveSync_Exception('Protocol error');
+                    }
                     if (!$this->_decoder->getElementEndTag()) {
                         throw new Horde_ActiveSync_Exception('Protocol error');
                     }