From patchwork Wed Aug 2 06:30:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 4592 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp881609vsu; Wed, 2 Aug 2017 00:18:18 -0700 (PDT) X-Received: by 10.223.188.17 with SMTP id s17mr15492680wrg.201.1501658298467; Wed, 02 Aug 2017 00:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501658298; cv=none; d=google.com; s=arc-20160816; b=wUSPQMfKsPU3OAmUWdSV4vyy0mX/PeTK7s/wMGlKWBMKA+7YNQBidI63n0EGcJ9ccV DfhRwuKMZcpmUD7bHq1hA5WnXVlmEXAYvHf5MfkeQ7WMXIrdVTEQ2XHisZeKI1Is83qO bnEZbCB4EYtrpBTpQfrC9fg6gQzhMe5S6rQZUcONBLCHJKraEtaMvBWDBLwXmIj4LzE9 qDKbemPB5SJeCfS7FagvBIitH/EgKeor6A7E8l4jc14vZ33Au5i6BPUl5Rx4yciSRDen 0cOQxDeV/6mgyO7/DzUpPjQYx7rXl1XTVc/DTWRkwdNHcrKLAzmUewku2JFnPNalwzLh WWDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=MJxolCiaQ75VmmOz5TGJljJUz08Vg9E1BgmyDLXwJ3g=; b=z8x7pD0MYaTch8D+UWdlvlRy/TC8PAnBn5nDzHIH+OqXZ2Lzivl0N6VK69es9YO+jz qsByBgSENBEoOSy0tVgxmNbDzAGP7RzPX5SrAcx7UC9tH8FXzMunUHiLIwBXaCIMceaQ M8IZwkd1JF+ej3YvOHROsV9lN5yfdMgnzk+ezjmyDwCIkPXIlJS2AlVcyARpQcREuCVV hEQYJ0tn2gCqkI2gSvP7ghaO2FTOxanvqzwA8LiIDoPLrXpvEkRxKRHtm6iUwcrTMisz yfjgYYNdaO41MbB3QOv3PUzmhv1Eyady7DeOaWE9FBpso6EjyoLhLMoFUYgFyQL+GUIe VcVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=scsdegIW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f184si2724253wma.85.2017.08.02.00.18.18; Wed, 02 Aug 2017 00:18:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=scsdegIW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D18268A49F; Wed, 2 Aug 2017 10:17:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f51.google.com (mail-it0-f51.google.com [209.85.214.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2928C68A478 for ; Wed, 2 Aug 2017 10:17:23 +0300 (EEST) Received: by mail-it0-f51.google.com with SMTP id 77so19389946itj.1 for ; Wed, 02 Aug 2017 00:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=4Kb5f4M7Z6dBAUXt6/9rc6lQnTaNGBW5ic8YqNABSEo=; b=scsdegIWq/Q4TfxrgoSSEyFVfd//i2YEalcOofjrZ+XS44LcxMxtNJvpTUfFYBXAht sY5bSJ9U0EGFbNg/7jSGAmj320rURtfaMME65ec5YHEHSLuvX7O6ViFjOAxt13yuGeSR eHu4s8dk+jmHALZXM9OAMDGIOrcBXlN9Tt+EPOGXGklnAXwN5Q6hJ/L2kY42UE2ttI6v KXyW1Yn75HuYv8dP/9v9wI1ywRz4S2liMJswd5OOcZSj5IjIO3F1Jwy8PXyz84cURk56 rXJgGEM9DMSkfkiKDPM06pl53aWcQPt8Q+0LReb894cRz10sXshrpY984xfesM6ObPjp f/Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4Kb5f4M7Z6dBAUXt6/9rc6lQnTaNGBW5ic8YqNABSEo=; b=J7zduHXyJsfQxhVoqY/+Yy+M3LBI4CS54tracS0AEwxdko9mvfL/m9BvlN/FhYVSzn wR3LELzu4r434E2y5OZOJvAcq9Fg1FxEwEiRINAIoq72XSqdNgspoqhwAbOALHOlfZml 3kbAkltG0tuXpmyA/eKPJk9kNdBlnJFVCDqdhoa2vFQbPagpSP1ONFDJ+mSzQ3qBHGoz W7A7hsx3A1EnL5YNxaKi31hWQ07nnBr7wnBg/nygUAMV/3aCxrLsaAHPHPj/CpA9yw+9 yPMUlR1SyMq8jGC4LGNkoyegB2lKPvWaBoXlagUmqedVe05snVPbS2kh0g57WpWZZYGW G08A== X-Gm-Message-State: AIVw1120T0EyhvbC5bp8ihrE3idRH/cVVl462NCpZP7cpA29OzK6DJti B1bVQpP+XuMx1V9mbzI= X-Received: by 10.36.254.6 with SMTP id w6mr4419392ith.158.1501658245004; Wed, 02 Aug 2017 00:17:25 -0700 (PDT) Received: from rcombs-NAS.hsd1.il.comcast.net. (c-73-110-121-59.hsd1.il.comcast.net. [73.110.121.59]) by smtp.gmail.com with ESMTPSA id 196sm4382274iou.50.2017.08.02.00.17.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Aug 2017 00:17:24 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2017 01:30:44 -0500 Message-Id: <1501655445-18976-6-git-send-email-rodger.combs@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1501655445-18976-1-git-send-email-rodger.combs@gmail.com> References: <1501655445-18976-1-git-send-email-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/7] lavf/flacenc: avoid buffer overread with unexpected extradata sizes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/flacenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 9768b6a..1906aee 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -322,7 +322,7 @@ static int flac_write_trailer(struct AVFormatContext *s) if (!c->write_header || !streaminfo) return 0; - if (pb->seekable & AVIO_SEEKABLE_NORMAL) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL && (c->streaminfo || s->streams[0]->codecpar->extradata_size == FLAC_STREAMINFO_SIZE)) { /* rewrite the STREAMINFO header block data */ file_size = avio_tell(pb); avio_seek(pb, 8, SEEK_SET);