diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch b/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch index 771ec9290..9ee7e46a6 100644 --- a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch +++ b/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch @@ -14,20 +14,17 @@ CVE: CVE-2017-8362 Upstream-Status: Backport [https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -removed hunk #2 as it was only cosmentic and caused a merge conflict. -signef-off-by: Armin Kuster <akuster808@gmail.com> --- src/flac.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -Index: libsndfile-1.0.27/src/flac.c -=================================================================== ---- libsndfile-1.0.27.orig/src/flac.c -+++ libsndfile-1.0.27/src/flac.c +diff --git a/src/flac.c b/src/flac.c +index 5a4f8c2..e4f9aaa 100644 +--- a/src/flac.c ++++ b/src/flac.c @@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf) - const FLAC__int32* const *buffer = pflac->wbuffer ; - unsigned i = 0, j, offset ; + const int32_t* const *buffer = pflac->wbuffer ; + unsigned i = 0, j, offset, channels, len ; + if (psf->sf.channels != (int) frame->header.channels) + { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n" @@ -40,7 +37,15 @@ Index: libsndfile-1.0.27/src/flac.c /* ** frame->header.blocksize is variable and we're using a constant blocksize ** of FLAC__MAX_BLOCK_SIZE. -@@ -410,7 +418,7 @@ sf_flac_meta_callback (const FLAC__Strea +@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf) + return 0 ; + } ; + +- + len = SF_MIN (pflac->len, frame->header.blocksize) ; + + if (pflac->remain % channels != 0) +@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ { case FLAC__METADATA_TYPE_STREAMINFO : if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" @@ -49,3 +54,6 @@ Index: libsndfile-1.0.27/src/flac.c psf->sf.channels, metadata->data.stream_info.channels) ; psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; return ; +-- +2.7.4 + |