From patchwork Mon Nov 27 06:56:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 6400 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1329779jah; Sun, 26 Nov 2017 22:56:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMac7pKyEYeZ4Qht/UTX3lJBSCO5vjKXBNRTMBrXpxC1xJyN9D2/pTVJ4oQCwryiPy9uVXBl X-Received: by 10.223.135.1 with SMTP id a1mr2829160wra.50.1511765808482; Sun, 26 Nov 2017 22:56:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511765808; cv=none; d=google.com; s=arc-20160816; b=oAhaSOXJbZ1tf5YriDR8IVv1tcn0sTMS9MGp9b+/YsdHJO+TrbDnyvd7tT9TI5ewt9 L8anjyjA4XwIXEncHzTPYUw299YpvLjAPrs2NEcsmN5rQOLUdlfbs2pmBYPMfN/kRyik 669BaJl1jzMOFUD01Lg8u6fWw9wKyEJGt2rj/M2w4aZA9B4ktqGMznRKNMfp1ldZBqLW Ebwz4e6ba01dK4FTppxZEM0hiLZLb30hs7xY7mnXJYW8UZq2eZAVSf04m2CP9CpPjSpb KUCoffGoYIbw8DNUPZNsLuwm8RYmv9Z0yMs1U4Et1OPJDYuGBFxhIoy4hmQwxcm0tEyH hleA== 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=oCyhj6b9xj9CqAzbnk+ofTJ6+/pI0ub81FijCdr8Q0g=; b=y1TGwBksrNNHAg31tUZNQHrVDm3x8j3ihYv39VjEryIk9M4b+IvG25X/WpgMuAOxGY gzW5ad+e+o/qUd7JbVC+4pbpqpTgwYP6w1+ON5tM6vAyN15g1yZ4KfImWBR/K6V279wV mjQvwqXVZporECBc1TDIMky17SU7OzhHknKfw21ODbhqkQpUxZ2rFza6dyzzFlV47NHT qiMdBjqnTx0/db9ekX7NXEGFVPJKrgSCfeA7AmZc8yU+naTq9jESrBGGJ4GpLuAFkvdi b/0jw+6knWnj/7egcF7NQ0d2+NDRp+rnqFROy1aUeY4b4jAg+sd43n9OqcEJwPUw1dy8 gvgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=SdKLwYLE; 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 x130si10717886wmg.212.2017.11.26.22.56.47; Sun, 26 Nov 2017 22:56:48 -0800 (PST) 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=@163.com header.s=s110527 header.b=SdKLwYLE; 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 C0B46689ED5; Mon, 27 Nov 2017 08:56:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-13.163.com (m12-13.163.com [220.181.12.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3CC0689C1D for ; Mon, 27 Nov 2017 08:56:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=NrWj+vbyAwM2mVQwAw m0TjA0nCrLIXYqRpx5xY94OY0=; b=SdKLwYLERRvNWazxF3Z4rkCJgESZQ6Ca/H Si+Q93ombdSQ4jfSfAobc36ERN8UXo4iiLYTNIDhy8GOycstCTIwErMx1g7qEy9d TB5U9RSvVR8kKs446AXSaFWqV9ULfjVhZ3g8HWXXYRXBYgAx6KniIC15qeV82LOO PnFFwyLRM= Received: from localhost.localdomain (unknown [106.120.213.112]) by smtp9 (Coremail) with SMTP id DcCowADHYiUhtxtamAXoBQ--.6849S3; Mon, 27 Nov 2017 14:56:36 +0800 (CST) From: Pan Bian To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 14:56:32 +0800 Message-Id: <1511765792-28805-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: DcCowADHYiUhtxtamAXoBQ--.6849S3 X-Coremail-Antispam: 1Uf129KBjvdXoWruF18Ww48KF4DXr1rAr4xJFb_yoWfGwcEqa yfZFWrC34kZ34xZ398Aa13Jry0gw1xZayjyr97tr43WF90vrn8Xry7XrykZF43u3y8CFZF gr18Cr48Ar18KjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU16BTDUUUUU== X-Originating-IP: [106.120.213.112] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBZwSdcletn6O9iQAAs+ Subject: [FFmpeg-devel] [FFmpeg-devel 1/1] avcodec/samidec: check av_strdup() return value 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: Pan Bian MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In function sami_paragraph_to_ass(), the return value of av_strdup() is not checked. To avoid potential NULL dereference, the return value should be checked against NULL. Signed-off-by: Pan Bian --- V2: fix patcheck warnings --- libavcodec/samidec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c index 2620424..6a59806 100644 --- a/libavcodec/samidec.c +++ b/libavcodec/samidec.c @@ -48,6 +48,9 @@ static int sami_paragraph_to_ass(AVCodecContext *avctx, const char *src) AVBPrint *dst_content = &sami->encoded_content; AVBPrint *dst_source = &sami->encoded_source; + if (!dupsrc) + return AVERROR(ENOMEM); + av_bprint_clear(&sami->encoded_content); av_bprint_clear(&sami->content); av_bprint_clear(&sami->encoded_source);