Fix null parameter to sscanf() on SimpleMessage

thePanz · thePanz · commit fccf193a9270 · 2025-01-13T09:13:17.000+01:00
diff --git a/lib/classes/Swift/Mime/SimpleMessage.php b/lib/classes/Swift/Mime/SimpleMessage.php
@@ -489,9 +489,11 @@ public function setPriority($priority)
      */
     public function getPriority()
     {
-        list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
-            '%[1-5]'
-            );
+        $fieldModel = $this->_getHeaderFieldModel('X-Priority');
+        if (!$fieldModel) {
+            return 3;
+        }
+        list($priority) = sscanf($fieldModel, '%[1-5]');
 
         return isset($priority) ? $priority : 3;
     }

Original file line number	Diff line number	Diff line change
`@@ -489,9 +489,11 @@ public function setPriority($priority)`
`489`	`489`	`*/`
`490`	`490`	`public function getPriority()`
`491`	`491`	`{`
`492`		`- list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),`
`493`		`- '%[1-5]'`
`494`		`- );`
	`492`	`+ $fieldModel = $this->_getHeaderFieldModel('X-Priority');`
	`493`	`+ if (!$fieldModel) {`
	`494`	`+ return 3;`
	`495`	`+ }`
	`496`	`+ list($priority) = sscanf($fieldModel, '%[1-5]');`
`495`	`497`
`496`	`498`	`return isset($priority) ? $priority : 3;`
`497`	`499`	`}`