diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-06 12:22:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 12:22:16 +0100 |
| commit | 776dd16bdb659421450fe274a941521cdaabfe83 (patch) | |
| tree | 58f7b3ec8cc109f006e177d105b78aebba0b5209 | |
| parent | 383a5f650511437bb2b591bc74924b0b33687f09 (diff) | |
| parent | 1be0f05e3f70a369e9e3e5153d0f786c0d2dface (diff) | |
Merge pull request #4457 from KN4CK3R/develop
Fix CI_Image_lib::get_image_properties() invalid image handling
| -rw-r--r-- | system/language/english/imglib_lang.php | 1 | ||||
| -rw-r--r-- | system/libraries/Image_lib.php | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php index 363b90074..218874cfe 100644 --- a/system/language/english/imglib_lang.php +++ b/system/language/english/imglib_lang.php @@ -51,6 +51,7 @@ $lang['imglib_libpath_invalid'] = 'The path to your image library is not correct $lang['imglib_image_process_failed'] = 'Image processing failed. Please verify that your server supports the chosen protocol and that the path to your image library is correct.'; $lang['imglib_rotation_angle_required'] = 'An angle of rotation is required to rotate the image.'; $lang['imglib_invalid_path'] = 'The path to the image is not correct.'; +$lang['imglib_invalid_image'] = 'The provided image is not valid.'; $lang['imglib_copy_failed'] = 'The image copy routine failed.'; $lang['imglib_missing_font'] = 'Unable to find a font to use.'; $lang['imglib_save_failed'] = 'Unable to save the image. Please make sure the image and file directory are writable.'; diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 0685692de..ebcfc6748 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -1639,6 +1639,11 @@ class CI_Image_lib { } $vals = getimagesize($path); + if ($vals === FALSE) + { + $this->set_error('imglib_invalid_image'); + return FALSE; + } $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); $mime = (isset($types[$vals[2]])) ? 'image/'.$types[$vals[2]] : 'image/jpg'; |