Merge branch 'MDL-71487-310' of https://github.com/paulholden/moodle into MOODLE_310_STABLE

2021-08-18 09:55:04 +01:00
parent 350b022f8d a23c3e4507
commit f6f0f5bb6a
1 changed files with 3 additions and 1 deletions
@@ -126,6 +126,7 @@ class filesize extends \admin_setting {
        if (is_null($bytes)) {
            return null;
        }
+        $bytes = intval($bytes);

        return self::parse_bytes($bytes);
    }
@@ -145,9 +146,10 @@ class filesize extends \admin_setting {
            return get_string('errorsetting', 'admin');
        }

+        // Calculate size in bytes, ensuring we don't overflow PHP_INT_MAX.
        $bytes = $data['v'] * $data['u'];
+        $result = (is_int($bytes) && $this->config_write($this->name, $bytes));

-        $result = $this->config_write($this->name, $bytes);
        return ($result ? '' : get_string('errorsetting', 'admin'));
    }