From patchwork Tue Oct 13 02:34:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22896 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 2E45B44ACAB for ; Tue, 13 Oct 2020 05:34:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 018C768BAFF; Tue, 13 Oct 2020 05:34:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 845BC68BA43 for ; Tue, 13 Oct 2020 05:34:36 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id w21so7084568plq.3 for ; Mon, 12 Oct 2020 19:34:36 -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=uhSuJxn3G8Pz63BHyc3tFS5ykSviUa0H5CldolGU8Y4=; b=TS3ALyiyrIZpQOE0Dxkw54eyDD3Fpep7U0nw4Lw2aCZmsnAYY+8+o/qYCbfS0Qax5v DmSSKrJ0KJUApTXFHyk1T7eDFeySSZNCEigPifEZudj9okyhu92dDPadq0OIYyEzbW/N 8eycO1FOZ2xZlfDyQ0xewKfqw/MiORly76TTXgZRjG5vqJVX5f59qAAs8ZTqMt2/VFdm Mol2t8Xf+A+GTrx0MqBsMXnUoI5iZbQfButR8jWXZNDeY0i+lqM2fBqHqjC/yeVvr5Dn IcsGLnBQcrB+kNIcrwcTT94bDM9RL5iK1I3FIvde3oA79V0BebHx3HPfThz7omQDwTET qjOA== 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=uhSuJxn3G8Pz63BHyc3tFS5ykSviUa0H5CldolGU8Y4=; b=euA4nWmSJQVronR7zTZIQ30xoBF6ZmyiZrzdiwbb+z9/czSxfhuwS47pbadM2td54/ xCizVf3+V1iYFHXNJV3fv7I6B04F+IhSxPUwTZ3znYWo+ulqax/kPPvZlCHykoKE+f4z kfyPwHUW6OSXd5+avFh0Oim2cW01pgQtSUNtXcDFSlN/y/0eShTkyFXPRQ2iQaSpAX9f B/Jlge6pG94GVMIRbrGRQeo01l/9rBHSnmOh/zaQKmmLN59O+/dZM5ZD1trxTS97aIV5 CwFa1Shff7BTiZnxTj4vMsrwYESWK5Yr0akpzq3ye5CPGqsL8QOaDcBECyZSn4cO5Ur2 TuiA== X-Gm-Message-State: AOAM532XMixJBFd854en51qmV+CajnFw3wJG8pYqr0zdbWLAD0kdRlGb Y3NFavxGxOJ+pFcWCCEySZlUCNl0d6ljppGB X-Google-Smtp-Source: ABdhPJxOKKSZ1QuFgYwUmo3qbr9v5ZIFdaOGZXXK8RqX8YTVgZBkMNXBAu59Y8IqkTdFQBUnFiueNg== X-Received: by 2002:a17:902:9698:b029:d1:9492:745b with SMTP id n24-20020a1709029698b02900d19492745bmr27189207plp.26.1602556474478; Mon, 12 Oct 2020 19:34:34 -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 y137sm21853640pfc.77.2020.10.12.19.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 19:34:33 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 13:34:27 +1100 Message-Id: <20201013023427.59882-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: chk 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" A report on Trac came in about this failure scenario where there are potential failures to allocate memory which are going unchecked in the code. This should fix that error in the same way that other parts of the codebase already handle similar situations --- libavfilter/dnn/dnn_backend_native.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavfilter/dnn/dnn_backend_native.c b/libavfilter/dnn/dnn_backend_native.c index d45e211f0c..06980de6e7 100644 --- a/libavfilter/dnn/dnn_backend_native.c +++ b/libavfilter/dnn/dnn_backend_native.c @@ -80,7 +80,15 @@ 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(); + if (!in_frame) { + av_log(&native_model->ctx, AV_LOG_ERROR, "Could not allocate in_frame memory\n"); + return DNN_ERROR; + } AVFrame *out_frame = av_frame_alloc(); + if (!out_frame) { + av_log(&native_model->ctx, AV_LOG_ERROR, "Could not allocate out_frame memory\n"); + return DNN_ERROR; + } in_frame->width = input_width; in_frame->height = input_height;