ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4697 from ZoneMinder/copilot/sub-pr-4694-again 

fix: guard getimagesize() return value in getFormChanges()
split_out_filter_settings
Isaac Connor 2026-03-09 14:55:45 -04:00 committed by GitHub
parent 0fd4bb9ab6 d56f0e3985
commit 0dc0c30cba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/includes/functions.php
View File

@ -523,8 +523,12 @@ function getFormChanges($values, $newValues, $types=false, $columns=false) {
case 'image' :
if ( is_array( $newValues[$key] ) ) {
$imageData = getimagesize( $newValues[$key]['tmp_name'] );
$changes[$key.'Width'] = $key.'Width = '.intval($imageData[0]);
$changes[$key.'Height'] = $key.'Height = '.intval($imageData[1]);
if ( !is_array($imageData) ) {
ZM\Warning("getimagesize failed for uploaded field '$key'; skipping width/height update.");
} else {
$changes[$key.'Width'] = $key.'Width = '.intval($imageData[0]);
$changes[$key.'Height'] = $key.'Height = '.intval($imageData[1]);
}
$changes[$key.'Type'] = $key.'Type = '.dbEscape($newValues[$key]['type']);
$changes[$key.'Size'] = $key.'Size = '.intval($newValues[$key]['size']);
ob_start();
@ -537,7 +541,6 @@ function getFormChanges($values, $newValues, $types=false, $columns=false) {
break;
case 'document' :
if ( is_array( $newValues[$key] ) ) {
$imageData = getimagesize( $newValues[$key]['tmp_name'] );
$changes[$key.'Type'] = $key.'Type = '.dbEscape($newValues[$key]['type']);
$changes[$key.'Size'] = $key.'Size = '.intval($newValues[$key]['size']);
ob_start();