| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 43ecb6431077ff54e9df27f71737e6e96d6c039f Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 21 Aug 2018 14:46:43 +0800 |
| 4 | Subject: [PATCH] From 5f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 |
| 5 | 00:00:00 2001 From: Erik de Castro Lopo <erikd@mega-nerd.com> Date: Sat, 8 |
| 6 | Apr 2017 18:34:49 +1000 Subject: [PATCH] stream_decoder.c: Fix a memory leak |
| 7 | |
| 8 | Leak reported by Secunia Research. |
| 9 | |
| 10 | Upstream-Status: Backport[https://git.xiph.org/?p=flac.git;a=commit; |
| 11 | h=4f47b63e9c971e6391590caf00a0f2a5ed612e67] |
| 12 | |
| 13 | Update patch to version 1.3.2 |
| 14 | CVE: CVE-2017-6888 |
| 15 | |
| 16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 17 | --- |
| 18 | src/libFLAC/stream_decoder.c | 3 +++ |
| 19 | 1 file changed, 3 insertions(+) |
| 20 | |
| 21 | diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c |
| 22 | index d364b0c..ebf93da 100644 |
| 23 | --- a/src/libFLAC/stream_decoder.c |
| 24 | +++ b/src/libFLAC/stream_decoder.c |
| 25 | @@ -1759,6 +1759,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre |
| 26 | } |
| 27 | memset (obj->comments[i].entry, 0, obj->comments[i].length) ; |
| 28 | if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { |
| 29 | + /* Current i-th entry is bad, so we delete it. */\ |
| 30 | + free (obj->comments[i].entry) ; |
| 31 | + obj->comments[i].entry = NULL ; |
| 32 | obj->num_comments = i; |
| 33 | goto skip; |
| 34 | } |
| 35 | -- |
| 36 | 2.7.4 |
| 37 | |