From: Mans Rullgard <mans@mansr.com>
To: sox-devel@lists.sourceforge.net
Subject: [PATCH 5/8] flac: fix crash on corrupt metadata (CVE-2017-15371)
Date: Thu, 26 Apr 2018 14:15:49 +0100 [thread overview]
Message-ID: <20180426131552.29249-6-mans@mansr.com> (raw)
In-Reply-To: <20180426131552.29249-1-mans@mansr.com>
---
src/flac.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/flac.c b/src/flac.c
index 0d7829ec830d..07f45c1be8e4 100644
--- a/src/flac.c
+++ b/src/flac.c
@@ -119,9 +119,10 @@ static void decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FL
p->total_samples = metadata->data.stream_info.total_samples;
}
else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
+ const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment;
size_t i;
- if (metadata->data.vorbis_comment.num_comments == 0)
+ if (vc->num_comments == 0)
return;
if (ft->oob.comments != NULL) {
@@ -129,8 +130,9 @@ static void decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FL
return;
}
- for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
- sox_append_comment(&ft->oob.comments, (char const *) metadata->data.vorbis_comment.comments[i].entry);
+ for (i = 0; i < vc->num_comments; ++i)
+ if (vc->comments[i].entry)
+ sox_append_comment(&ft->oob.comments, (char const *) vc->comments[i].entry);
}
}
--
2.17.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
SoX-devel mailing list
SoX-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sox-devel
next prev parent reply other threads:[~2018-04-26 13:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 13:15 [PATCH 0/8] CVE fixes Mans Rullgard
2018-04-26 13:15 ` [PATCH 1/8] wav: fix crash if channel count is zero (CVE-2017-11332) Mans Rullgard
2018-04-26 13:15 ` [PATCH 2/8] hcom: fix crash on input with corrupt dictionary (CVE-2017-11358) Mans Rullgard
2018-04-26 13:15 ` [PATCH 3/8] wav: fix crash writing header when channel count >64k (CVE-2017-11359) Mans Rullgard
2018-04-26 13:15 ` [PATCH 4/8] wav: ima_adpcm: fix buffer overflow on corrupt input (CVE-2017-15370) Mans Rullgard
2018-04-26 13:15 ` Mans Rullgard [this message]
2018-04-26 13:15 ` [PATCH 6/8] adpcm: fix stack overflow with >4 channels (CVE-2017-15372) Mans Rullgard
2018-04-28 0:34 ` Eric Wong
2018-04-28 10:54 ` Måns Rullgård
2018-04-28 11:21 ` Sonny Ray
2018-04-28 12:50 ` Måns Rullgård
2018-04-26 13:15 ` [PATCH 7/8] aiff: fix crash on empty comment chunk (CVE-2017-15642) Mans Rullgard
2018-04-26 13:15 ` [PATCH 8/8] xa: validate channel count (CVE-2017-18189) Mans Rullgard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.sourceforge.net/lists/listinfo/sox-devel
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180426131552.29249-6-mans@mansr.com \
--to=sox-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/sox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).