From patchwork Tue Oct 13 05:15:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22903 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 0023E44B092 for ; Tue, 13 Oct 2020 08:16:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D067F68BB2C; Tue, 13 Oct 2020 08:16:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3AAE68A2B6 for ; Tue, 13 Oct 2020 08:16:08 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id b26so15998954pff.3 for ; Mon, 12 Oct 2020 22:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miceli-net-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NieEtqDJwj392Ymh4fqHWFENMzi9yRgwrDQqbuHh0L0=; b=Nj+b7kWejUgnspeIib9dW1Kqs/0FbMhf+CKwrq2/C6Jrzjjpva23Mw+PMbItr4k93x v3m4ry56iE9ls6wG2YahGORlHYR9NHovj3DiLzHOrrbNrIU8LXWFDM+aBp9UbSwbjvFO 8gKHhcX+/tbkd3bxeUPdVDAdPXIWjhp6hrFW89IYoOOpOUVy4eKSzKp8XCerXhJDphGT 4TgHlOo1l2K0KJ3m2TozE67gKzMbIZeHL0uA6Ra6GDHXvr+wJdDGPoFXQ5BMCZ7lcdwM +bxE213/+a2u35IgHt+uS3AEQFo3kxgXDZYJri/WoK6bklhE8ctblaXSIFLzkys/hwJz 4IWA== 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:mime-version :content-transfer-encoding; bh=NieEtqDJwj392Ymh4fqHWFENMzi9yRgwrDQqbuHh0L0=; b=IxHtiZOLHbLJe0Ti3kI+vmNqCyKbVVJ763kbOMxJosuR27Mpkwj9VaH7Hr3DcDLQdq xYHAn4460ScTm5raS3j8vxfzxdMgI/8Azhh6Q9RulMtJfKBELxS+ML//wLsiuaY4crxE ei3Yfz+RqlOnrV7g7iCtfWxANrccmOBXdMzkJzwK/4abRneseQ+nonUMORbf6MtM+2qt kr8Fzu82gacjvsB8XH8toTQt6HcxTWgmpMC68cYaASxvHylfhStgFD/afRvycSOZWT+b RIwTfuKJ1pjo+N7Diyx33sMq3MYbT1Ch4QUe6+TzIBhJwKJZaut9MLornmhPGUIJkT7N AkXA== X-Gm-Message-State: AOAM532l56XwZONbKDcMG/2ywWcHCZLK/t0iJvVTIzv2nnERdtYv3Nhg P8/mtJ9+GAjAIOaq44Lw0ReOBswbjcXre6/8 X-Google-Smtp-Source: ABdhPJwmZEaNzek0QTW3g1AQOfd6K/rvPpfj4Enog4gCoEM/5IiheS8cTzdTx3a1D1M2p3FE18rjVg== X-Received: by 2002:a62:3207:0:b029:142:6a8f:c40e with SMTP id y7-20020a6232070000b02901426a8fc40emr26208261pfy.69.1602566166607; Mon, 12 Oct 2020 22:16:06 -0700 (PDT) Received: from edna.localdomain (119-18-3-107.771203.syd.nbn.aussiebb.net. [119.18.3.107]) by smtp.gmail.com with ESMTPSA id t9sm21165134pgp.90.2020.10.12.22.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 22:16:05 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 16:15:58 +1100 Message-Id: <20201013051558.198897-1-chris@miceli.net.au> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavfilter/dnn_backend_native: check mem allocation 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: Chris Miceli Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" check that frame allocations return non-null. --- libavfilter/dnn/dnn_backend_native.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_native.c b/libavfilter/dnn/dnn_backend_native.c index d45e211f0c..7958ceb4f7 100644 --- a/libavfilter/dnn/dnn_backend_native.c +++ b/libavfilter/dnn/dnn_backend_native.c @@ -80,7 +80,18 @@ static DNNReturnType get_output_native(void *model, const char *input_name, int DNNReturnType ret; NativeModel *native_model = (NativeModel *)model; AVFrame *in_frame = av_frame_alloc(); - AVFrame *out_frame = av_frame_alloc(); + AVFrame *out_frame = NULL; + + if (!in_frame) + return DNN_ERROR; + + out_frame = av_frame_alloc(); + + if (!out_frame) { + av_frame_free(&in_frame); + return DNN_ERROR; + } + in_frame->width = input_width; in_frame->height = input_height;