From patchwork Fri Mar 30 05:08:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8237 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2483065jad; Thu, 29 Mar 2018 22:08:34 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+KSc/qxVZPyI06260LilUWh3GXdN4xYROXCFSEaEnjVBpOtvWmTKksGXRm8k/5wUbYGznP X-Received: by 10.223.150.111 with SMTP id c44mr8841774wra.90.1522386514494; Thu, 29 Mar 2018 22:08:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522386514; cv=none; d=google.com; s=arc-20160816; b=glJu2u6uhf0X94F7CwqQOJ65vJrAMM+KnP8uRMWq5bTyQUiqXRJKXosITwhK2u+Jdl J2B573FaTvWi7kAJlYXAepdvuiUbthOR9xiYbLwtsUO9mKNQFzRN+ME3w0WUvbUhb9UC HWQ3Pox4GeXIwf2hxcCW/68W8d/lm7iVoc90Gzs//bkoE1ihLyrrDFFV5QCobGC6oJm9 5m39GzqsGnFlV3fxcFnFixLati+GcS0pYXLi8u8KpjhKCIqF0hbZhOxT8ZxRD2egO4NH +A78GI+pd14QpSGuMk/bf3hThTI5ZVkbC66R83saf7jylI0G9VJTn6RoI5hPJFt7GZj8 WPdQ== 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:feedback-id:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=MBx9V6S4VMVnUTjovcxYZH7l3PVsuk5BTG9pQnx8hDs=; b=clYlHdaySN8CPCfuGfmhJXSofX1JU7gubTk3zEtGnAM3n9PN/yydEVwDbEL6U0VHk9 BHsnWCmff9bPjXI9Q8WlM8ye7HsorrEOvpAdMttdq7Esf52LP0KDlQjsyTTS6qToRfVv skKtaNpRhDEPDT/QnWv6HsjAIoAjljKiTtKlHnxkaYe6J/yonrSK0wmQ1ruExqv+/MfL 1PQj8nmoLfk4SaVHEIVdMHy+CmcaqU87DoxwKqYuKX6iXm4r7QEZZolDCyGzyd7Jt87p takd8pFFPKberPPBEFyP3YxjDi2KhI/I4yu+5ozZM5UasFbSsMAJZTnlz95hU22478PM t3/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=EzyjbC/B; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m21si842573wma.256.2018.03.29.22.08.34; Thu, 29 Mar 2018 22:08:34 -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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=EzyjbC/B; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC316689C7D; Fri, 30 Mar 2018 08:08:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7ECD68972B for ; Fri, 30 Mar 2018 08:08:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1522387411; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=PuCYgjuts13NZ8r9HnK3dXvFIUFWtuKI9B9loxKDylQ=; b=EzyjbC/B rT8X1Klz7wEUhCV6YzFQU5M4S+JlOG1hfwZh2itUS0eRX5BDHPDzg5UJ4R+ITg28YHlKSdQedeQL1 dCWAWM2WcBeDd8dbKZ8GWSX/6/iaH01S3w2ZTHI/0APgpyeGvSG42GWX4Kut48uWfGAavth7XdxRE XVLRPn/AUYaKI6/PsWPWIvX/X1LoEKlQ8R1qxXLBKS4nUXVs6/IIerAeaIomyRNSzpbfKRnLIbyfa d1NaAuLTgXVg56xdSf+ZFMZmPuy+mRFt69loG3FUBDEGL4ywN55kTzypCt7kPEaKVKETluToq0xDH 9szg/Mmt5Rc66EBhQj/sxY/jvA==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 10:38:18 +0530 Message-Id: <1522386498-16238-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1f1XGzNmF6EIG-.vYZEblES1 Feedback-ID: 337386m:337386asVRLGB:337386sPYy3ZlOa9:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 2/8] avformat/dashenc: check for null context to avoid uninitialized pointer access 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- libavformat/dashenc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index bdf8c8d..c0fe0a5 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -254,7 +254,9 @@ static int flush_dynbuf(OutputStream *os, int *range_length) // write out to file *range_length = avio_close_dyn_buf(os->ctx->pb, &buffer); os->ctx->pb = NULL; - avio_write(os->out, buffer + os->written_len, *range_length - os->written_len); + if (os->out) + avio_write(os->out, buffer + os->written_len, + *range_length - os->written_len); os->written_len = 0; av_free(buffer); @@ -1358,9 +1360,11 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) write_styp(os->ctx->pb); avio_flush(os->ctx->pb); len = avio_get_dyn_buf (os->ctx->pb, &buf); - avio_write(os->out, buf + os->written_len, len - os->written_len); + if (os->out) { + avio_write(os->out, buf + os->written_len, len - os->written_len); + avio_flush(os->out); + } os->written_len = len; - avio_flush(os->out); } return ret;