From patchwork Sat Oct 12 01:14:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 15705 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A1FF244A5F3 for ; Sat, 12 Oct 2019 04:14:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F458689AA0; Sat, 12 Oct 2019 04:14:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C554689A12 for ; Sat, 12 Oct 2019 04:14:51 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id d22so5219684pll.7 for ; Fri, 11 Oct 2019 18:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zD+nYD4rWZMjmEhXCknQkIsH5b+GofV5KkukLpS5SGY=; b=jc9SDiMzBo6CccED+1CxbB7K3w/bpW7wyeDItPn7CfHQUmleUpAO5ntwlJ1253y6pc Ca2Knsu7P+lF9ORlYVhsjbErhqQwdgHdFzd8m+T5qax1m1Obawbbkwmj75LNmpPXUFLs DG4ZmgkzIBTCYrRmXG/tlvpOwoeQjLqhddECD3Y6xWkEtTab8491UR22C8q3ENtQ1elX Il+FMTrY0gpcNJ0U6hT4tMOPdrvKyu+B9dlUd+7fQIIbLqroK5aIHl8NkTme56WG+qVv V2ZBtP+/6En2NT6f3xndc6UDHozWD4S9PMrAFZSxWn+T9FrW7kx106i9xU7vEMd4sWCq m4tw== 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:in-reply-to :references; bh=zD+nYD4rWZMjmEhXCknQkIsH5b+GofV5KkukLpS5SGY=; b=NmX/3kdLaC9NTWazkPW/LmK9BcoqYAZsUdP7iuZJoJwJpb9YmmAHIL3qr5mWkR2ZJq Qx4SkD1JMqKnusTmEDy9L11fJLMZZJ0ZV+aa0hK4bakYUP8EPLlsLcyHcyJuEUCDCjQc FjZYK0SIE5pxrJ66OKCBIRSvV/95aht9JOIZnbGgobHAUasqDXWeBtGuDUluiEip0O90 WSleN5vIjoJfEx4VTLp+u4CIWrCw17mgJumc2jOVylodVDraOXFdKyQes9RcSQy20aQy RHdpE5ade1mZXpehCH3ofqoQd8vrFerH7GTpqEMIJmMLFTi7JgLH9tLeh4bT4lBDTi/O KtBw== X-Gm-Message-State: APjAAAVWzoG2ltps4axV9Kt3Y2o70kmpXfJGb+Uxl9yRGc49iI12gg4A vUHPBUY5EpR8FFja996AN0AKWw66 X-Google-Smtp-Source: APXvYqym7B5O8UdlJF43DsbhYQFpn5NCZbzK7q2mt3ARP8+6Hz+tM4y++RUgXfUuni5OBIbXI+OsZw== X-Received: by 2002:a17:902:d698:: with SMTP id v24mr17852759ply.89.1570842889263; Fri, 11 Oct 2019 18:14:49 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s1sm7706570pgi.52.2019.10.11.18.14.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 18:14:48 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Oct 2019 09:14:39 +0800 Message-Id: <1570842880-22864-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1570842880-22864-1-git-send-email-mypopydev@gmail.com> References: <1570842880-22864-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/3] fftools/ffmpeg_opt: add error handle if av_asprintf return null 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao add error handle if av_asprintf return null. Signed-off-by: Jun Zhao --- fftools/ffmpeg_opt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index fa22eb3..af9a9a6 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3008,6 +3008,8 @@ static int opt_old2new(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; char *s = av_asprintf("%s:%c", opt + 1, *opt); + if (!s) + return AVERROR(ENOMEM); int ret = parse_option(o, s, arg, options); av_free(s); return ret; @@ -3039,6 +3041,8 @@ static int opt_qscale(void *optctx, const char *opt, const char *arg) return parse_option(o, "q:v", arg, options); } s = av_asprintf("q%s", opt + 6); + if (!s) + return AVERROR(ENOMEM); ret = parse_option(o, s, arg, options); av_free(s); return ret; @@ -3084,6 +3088,8 @@ static int opt_timecode(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; char *tcr = av_asprintf("timecode=%s", arg); + if (!tcr) + return AVERROR(ENOMEM); int ret = parse_option(o, "metadata:g", tcr, options); if (ret >= 0) ret = av_dict_set(&o->g->codec_opts, "gop_timecode", arg, 0);