From patchwork Mon May 15 16:47:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Meyers X-Patchwork-Id: 3672 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp90880vsk; Mon, 15 May 2017 09:47:27 -0700 (PDT) X-Received: by 10.28.167.197 with SMTP id q188mr4315570wme.79.1494866847696; Mon, 15 May 2017 09:47:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494866847; cv=none; d=google.com; s=arc-20160816; b=C5Ev/ld8+nYfFhLimxkEgy6V92B2MrXWLyMIRYq0SoxitxJcIt7CdVUuuIvZKXIYrm JHVqR2zqHv7LXlUeC0UIgWB5RuBaT3IsPiCosOlTkHOb/CjEyasgGm7+TofpSTyngPe8 uCdZGL6wMdwOOe3Dh+36ZQh1Pjl/P1J5dau/PHV9PyKfpnhveUO2OK2JLof/ZPGojHSY LGpq+HIiofA9zQ8oU8lLhoZHquAnJOM++AexHQJ9cVVl8jK/i3E4E9kSvk7vbVW8kdfI IqWOSJINBDD7saSNo2uzEcTh98FTcTOU8eDc5tlQJNWN5xMtgsoD/6vvJUbuDY1yIY/W MmFw== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=wjvRZkqHUhPVWIkhWSgIccFy/LLYvBDkFNbGWRbDlcg=; b=JWyHObJJuU9OdEfRvcPB71yhbkRTZk/kUQ0h0Ol802qIvbRXubxBEgoqqmpgLshqWY we7ZKTi2NnVsHweYP6AejZj1/ii5NogZQZkUzXM9o+59Ck/upS/BfkKu2Fv81//yK7zI 1NDoUSatNeyV18MJdYpNNrfSiToRcE8dfxaVu4cv50mTEjxK1FQMCZ5QV75w5VXr2kyY AhZOG81b6sLEmSJTjKMfmM2OhN2nRT8OPRYfsyrvpCYgojM/CwyRIVEZtIDRgCTtLXzf sMRZAED9dU18pVruHFlizgR5y7HGNT+5sAhmGJcLlgAAvvBQTv9+k1gimvBHJYjfDUeM z84Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g26si12732046wrb.36.2017.05.15.09.47.26; Mon, 15 May 2017 09:47:27 -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=@google.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 928DA6898DC; Mon, 15 May 2017 19:47:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f52.google.com (mail-pg0-f52.google.com [74.125.83.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF5F66809F0 for ; Mon, 15 May 2017 19:47:16 +0300 (EEST) Received: by mail-pg0-f52.google.com with SMTP id q125so43414503pgq.2 for ; Mon, 15 May 2017 09:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=U4MpcISzdXbVs6mq88Vdl91sYZA6dfgeMeySNr+la3E=; b=j91fIrhuvYaPRf4s/9iftVoNxt5EiW3D4dhnpUUvwzq5Gm3aPkCkLvt7vFvij/KvZq 0J/JE1xN9zJjtyb/SLudnq9U3E4A8Hmho+DXUtMNcelENFOIe4raJzlIJIEGp+V3L7Zo SeNRtpw8dwIMN5dXsaIBFrorYI8gSMQSiBdI4V8UKmwF/FDJvHCGxbMAoZYwo6QTaJ1D GImRBHFhcwUxzejD/lVcWCZNjJsEbLRbFyb9J9VI1svoZQT1ixS59UfQBSY5jb8nrBio jUjW4vC4pqC2a9K/2dx7Z805EYdQML0cLcA7rOWbxV4o4/3PW06LBvuUb793nXPIGDl4 uYIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U4MpcISzdXbVs6mq88Vdl91sYZA6dfgeMeySNr+la3E=; b=fmhvHIE2kTz4NePKUXgSbHDxGDJI9UDlYFp9VQzGGw3vVFJEQDr7UV+YANoE5hUJG7 6jZ2VUUvdjUlkg8IjWJ9F985GxQf5Hl1+U9pENeGQBMamEymDA+DqTsFQPNnjDY1XTrY Fh+2zM6/+WMvxJg9IjCgzU8SbEzOo8UBWytCMgFIXLhRxMvdajlshJtPAn0bPqI4L0Fm rXjoXq/tBk2fJOlLLcyXu5nPqudBNdRZLS6uDEz0TYEhMjCsXA0LpzHS3pVglM9lTwSU dY2JdDciUnXNuJ4/NXf8Hf63eYyO71acEsnVcOkJdzPiaQEUlwfqlFZbxBFGf1Zvqsy6 gmQQ== X-Gm-Message-State: AODbwcDdz807ntJPYyz0de2jtZ3iCDXBkbxWUH27eZBbYV/G5zPdC8C1 AGY+zKeiWrBo9wAp X-Received: by 10.98.89.5 with SMTP id n5mr7369678pfb.2.1494866834421; Mon, 15 May 2017 09:47:14 -0700 (PDT) Received: from robertmeyers0.mtv.corp.google.com ([100.98.24.67]) by smtp.gmail.com with ESMTPSA id t198sm19977028pgc.33.2017.05.15.09.47.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 May 2017 09:47:13 -0700 (PDT) From: Rob Meyers To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2017 09:47:10 -0700 Message-Id: <20170515164710.58582-1-robertmeyers@google.com> X-Mailer: git-send-email 2.13.0.rc2.291.g57267f2277-goog Subject: [FFmpeg-devel] [PATCH] libavformat aviobuf: Fixed dst pointer initialization in fill_buffer 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 Cc: Rob Meyers MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/aviobuf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 0a7c39eacd..4e04cb79e0 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -519,9 +519,7 @@ void avio_write_marker(AVIOContext *s, int64_t time, enum AVIODataMarkerType typ static void fill_buffer(AVIOContext *s) { - int max_buffer_size = s->max_packet_size ? - s->max_packet_size : IO_BUFFER_SIZE; - uint8_t *dst = s->buf_end - s->buffer + max_buffer_size < s->buffer_size ? + uint8_t *dst = !s->max_packet_size && s->buf_end - s->buffer < s->buffer_size ? s->buf_end : s->buffer; int len = s->buffer_size - (dst - s->buffer);