vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/video/readers/jpeg.c: Avoid division by zero.

Browse source
This commit is contained in:
Vladimir Serbinenko 2015-01-20 19:35:49 +01:00
parent 750f4bacd3
commit 4816dcac19
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/readers/jpeg.c: Avoid sivision by zero.
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com> 2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c: Validate volumes to avoid division * grub-core/disk/diskfilter.c: Validate volumes to avoid division

2
grub-core/video/readers/jpeg.c
View file

@ -317,7 +317,7 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data)
{ {
data->vs = ss & 0xF; /* Vertical sampling. */ data->vs = ss & 0xF; /* Vertical sampling. */
data->hs = ss >> 4; /* Horizontal sampling. */ data->hs = ss >> 4; /* Horizontal sampling. */
if ((data->vs > 2) || (data->hs > 2)) if ((data->vs > 2) || (data->hs > 2) || (data->vs == 0) || (data->hs == 0))
return grub_error (GRUB_ERR_BAD_FILE_TYPE, return grub_error (GRUB_ERR_BAD_FILE_TYPE,
"jpeg: sampling method not supported"); "jpeg: sampling method not supported");
} }