Avoid array access on null error in php 7.4

horde · Oct 11, 2020 · 4a8e248 · 4a8e248
1 parent 7ee962e
commit 4a8e248
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/Horde/ActiveSync/Message/Base.php b/lib/Horde/ActiveSync/Message/Base.php
@@ -345,7 +345,7 @@ public function decodeStream(Horde_ActiveSync_Wbxml_Decoder &$decoder)
             // Get next element and sanity check the type. We MUST have a
             // STARTTAG here, or it's time to break out.
             $entity = $decoder->getElement();
-            if ($entity[Horde_ActiveSync_Wbxml::EN_TYPE] == Horde_ActiveSync_Wbxml::EN_TYPE_ENDTAG) {
+            if (empty($entity) || $entity[Horde_ActiveSync_Wbxml::EN_TYPE] == Horde_ActiveSync_Wbxml::EN_TYPE_ENDTAG) {
                 $decoder->_ungetElement($entity);
                 break;
             }

diff --git a/lib/Horde/ActiveSync/Wbxml/Decoder.php b/lib/Horde/ActiveSync/Wbxml/Decoder.php
@@ -139,7 +139,9 @@ public function getFullInputStream()
     public function getElement()
     {
         $element = $this->getToken();
-
+        if (empty($element)) {
+            return false;
+        }
         switch ($element[self::EN_TYPE]) {
         case self::EN_TYPE_STARTTAG:
             return $element;
@@ -282,7 +284,10 @@ public function getToken()
         }
 
         $el = $this->_getToken();
-        $this->_logToken($el);
+
+        if (!empty($el)) {
+            $this->_logToken($el);
+        }
 
         return $el;
     }