Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 00:47:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: Trying to access array offset on value of type null

Browse source 
Now that the ResponseParser is fixed and handles NIL the BodyStructure class bug was detected
This commit is contained in:
djmaze 2021-11-04 16:27:08 +01:00
parent 40b8bf3d7e
commit a6ebee8e13
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
View file

@ -680,20 +680,20 @@ class BodyStructure
return null; return null;
} }
} }
}
$aDispParamList = $aDispList[1]; $aDispParamList = $aDispList[1];
if (\is_array($aDispParamList)) if (\is_array($aDispParamList))
{ {
$aDispositionParams = self::getKeyValueListFromArrayList($aDispParamList); $aDispositionParams = self::getKeyValueListFromArrayList($aDispParamList);
$sFileName = self::decodeAttrParameter($aDispositionParams, 'filename', $sCharset ?: ''); $sFileName = self::decodeAttrParameter($aDispositionParams, 'filename', $sCharset ?: '');
}
} }
} }
++$iExtraItemPos; ++$iExtraItemPos;
$sLanguage = null; $sLanguage = null;
if ($iExtraItemPos < count($aBodyStructure)) if ($iExtraItemPos < \count($aBodyStructure))
{ {
if (null !== $aBodyStructure[$iExtraItemPos] && 'NIL' !== $aBodyStructure[$iExtraItemPos]) if (null !== $aBodyStructure[$iExtraItemPos] && 'NIL' !== $aBodyStructure[$iExtraItemPos])
{ {
@ -778,9 +778,10 @@ class BodyStructure
private static function getKeyValueListFromArrayList(array $aList) : array private static function getKeyValueListFromArrayList(array $aList) : array
{ {
$aDict = array(); $aDict = array();
if (0 === \count($aList) % 2) $iLen = \count($aList);
if (0 === ($iLen % 2))
{ {
for ($iIndex = 0, $iLen = \count($aList); $iIndex < $iLen; $iIndex += 2) for ($iIndex = 0; $iIndex < $iLen; $iIndex += 2)
{ {
if (\is_string($aList[$iIndex]) && isset($aList[$iIndex + 1]) && \is_string($aList[$iIndex + 1])) if (\is_string($aList[$iIndex]) && isset($aList[$iIndex + 1]) && \is_string($aList[$iIndex + 1]))
{ {