Merge branch '2022.11'

tine20 · Nov 16, 2023 · 9235f1e · 9235f1e
2 parents 9be0957 + 01e01cd
commit 9235f1e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/tine20/Felamimail/Frontend/Http.php b/tine20/Felamimail/Frontend/Http.php
@@ -128,10 +128,13 @@ protected function _downloadAttachments($messageId, $partIds = [])
     /**
      * download node attachment
      *
-     * @param  string  $nodeId
-     * @param  string  $partId
+     * @param string $nodeId
+     * @param string $partId
+     * @return void
+     * @throws Tinebase_Exception_NotFound
+     * @throws Tinebase_Exception_SystemGeneric
      */
-    protected function _downloadNodeAttachment($nodeId, $partId)
+    protected function _downloadNodeAttachment($nodeId, $partId): void
     {
         if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__
             . ' Downloading Attachment ' . $partId . ' of node with id ' . $nodeId
@@ -151,6 +154,12 @@ protected function _downloadNodeAttachment($nodeId, $partId)
         /** @var GuzzleHttp\Psr7\Stream $stream */
         $stream = $attachment['contentstream'];
 
+        if ($stream === null) {
+            if (Tinebase_Core::isLogLevel(Zend_Log::WARN)) Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__
+                . ' Invalid stream');
+            return;
+        }
+
         if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . ' '
             . ' filename: '    . $filename
             . ' content type ' . $contentType