Merge pull request 'Check whether data is parsable by 'imagecreatefromstring' in jimIcon.' (#7) from wn/tt-rss:jimIcon-imagecreatefromstring into master
Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/7
This commit is contained in:
commit
ac6cea859a
|
@ -104,11 +104,11 @@ class jimIcon {
|
||||||
}
|
}
|
||||||
|
|
||||||
// See if we can parse it (might be PNG format here)
|
// See if we can parse it (might be PNG format here)
|
||||||
$i = @imagecreatefromstring($data);
|
if (self::has_parsable_image_type($data)) {
|
||||||
|
if ($i = @imagecreatefromstring($data)) {
|
||||||
if ($i) {
|
imagesavealpha($i, true);
|
||||||
imagesavealpha($i, true);
|
return $i;
|
||||||
return $i;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Must be a BMP. Parse it ourselves.
|
// Must be a BMP. Parse it ourselves.
|
||||||
|
@ -267,5 +267,12 @@ class jimIcon {
|
||||||
}
|
}
|
||||||
return $img;
|
return $img;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Checks whether the data is a type parsable by imagecreatefromstring()
|
||||||
|
private function has_parsable_image_type($image_data) {
|
||||||
|
$size = getimagesizefromstring($image_data);
|
||||||
|
return $size && in_array($size[2],
|
||||||
|
[IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_BMP, IMAGETYPE_WBMP, IMAGETYPE_WEBP]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue