nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1898606 - Guard against dupe SOF w/ incorrect source manager. r=tnikkel

Browse source 
Backport of upstream commit:
3c17063ef1

Differential Revision: https://phabricator.services.mozilla.com/D212120
This commit is contained in:
Ryan VanderMeulen 2024-06-04 12:10:02 +00:00
parent 7cc0a713a2
commit 08324af1aa
2 changed files with 7 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
media/libjpeg/MOZCHANGES
View file

@ -48,6 +48,10 @@ To upgrade to a new revision of libjpeg-turbo, do the following:
$ hg addremove $ hg addremove
== May 30, 2024 ==
* Fixed bug 1898606.
== May 9, 2024 (libjpeg-turbo v3.0.3 7fa4b5b762c9a99b46b0b7838f5fd55071b92ea5 2024-05-08) == == May 9, 2024 (libjpeg-turbo v3.0.3 7fa4b5b762c9a99b46b0b7838f5fd55071b92ea5 2024-05-08) ==
* Updated to v3.0.3 release. * Updated to v3.0.3 release.

6
media/libjpeg/jdmarker.c
View file

@ -248,6 +248,9 @@ get_sof(j_decompress_ptr cinfo, boolean is_prog, boolean is_lossless,
jpeg_component_info *compptr; jpeg_component_info *compptr;
INPUT_VARS(cinfo); INPUT_VARS(cinfo);
if (cinfo->marker->saw_SOF)
ERREXIT(cinfo, JERR_SOF_DUPLICATE);
cinfo->progressive_mode = is_prog; cinfo->progressive_mode = is_prog;
cinfo->master->lossless = is_lossless; cinfo->master->lossless = is_lossless;
cinfo->arith_code = is_arith; cinfo->arith_code = is_arith;
@ -265,9 +268,6 @@ get_sof(j_decompress_ptr cinfo, boolean is_prog, boolean is_lossless,
(int)cinfo->image_width, (int)cinfo->image_height, (int)cinfo->image_width, (int)cinfo->image_height,
cinfo->num_components); cinfo->num_components);
if (cinfo->marker->saw_SOF)
ERREXIT(cinfo, JERR_SOF_DUPLICATE);
/* We don't support files in which the image height is initially specified */ /* We don't support files in which the image height is initially specified */
/* as 0 and is later redefined by DNL. As long as we have to check that, */ /* as 0 and is later redefined by DNL. As long as we have to check that, */
/* might as well have a general sanity check. */ /* might as well have a general sanity check. */