From patchwork Wed Dec 9 09:53:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 24452 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 A66B744A93C for ; Wed, 9 Dec 2020 11:53:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90D1B68A0EA; Wed, 9 Dec 2020 11:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78FA3689FB2 for ; Wed, 9 Dec 2020 11:53:36 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id k14so1038443wrn.1 for ; Wed, 09 Dec 2020 01:53:36 -0800 (PST) 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=okdtJVZcQIL+fT/ZfQ7T7MUZJIIu9Z6wKgN2KdfXn+4=; b=G6Ld2/RlFcEWZOvTqnDBumbe6XTIscaus2KtMpGEy+b4nT24Z0Yr+b84tfRFcaOb/g ZsyvKWNHu8GxiZLWcAJ40LmEXMpKxx9WovMlGFkb1IvyPcs819MuDHRxh246D2vp4FHb nomW5OPx/DOtWNHAfRG8dCFa6RjYttGKPp1cZvk7vLIBLJ0I7V+A2c1HqJmAzTtHj8Td 3izfdogAUlTsBR/ojm73WwsxDqEzjvsNM8BteMFGAwwaOcJ2DR1/y5dRA9o1jd086eHO 0enqm6WdFgv35iT8fVLDtKWfh8fgPjfDYqaVQQYyA5hV/62X6G/GBpfiWZpI/mxuoDbp m7Xg== 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=okdtJVZcQIL+fT/ZfQ7T7MUZJIIu9Z6wKgN2KdfXn+4=; b=kHNfqVXFh4DyClirMzrqd7nvTUFLdmG6xY6P69/SS8DnFcVKWuIY5aXPITT4Ab8Sx2 ylLRG/vmXTn+/VaS41PLYt5LndIWbr3Z7v8BxhhPKDy0nm7pP2qCUI154qStPGIU38ey tq/rckkndAgtcQOlA304PQNbb8ScO3wTtN1rRtCWXxRAfzBli00oCopnYDBLsh/LHZ1+ ThxIYqy4k3n5Ldc18n8iPJ3WAD9v7d5VqFOsLkD4D6ot/mXrSE6b69mUFJ9Jo2RJt2ao On8qYQWRV2ScHTqyNRW8k3mRtzWiLSK0UoqBbxvlDro2NU1wzh/PgXcxcyF1lBnKpkQk zSow== X-Gm-Message-State: AOAM532V9RF4GMwLVkROcAWWeV+vvu3RAArBTDdwX3xLx5WYAh9aqZrx RebL6VfUDUmrQfWRoCecr0psQP7dfmvjRQ== X-Google-Smtp-Source: ABdhPJwCEdrK45cDLGrIyfWFmUE+8o304OQFbRfYdCRHy4swXlnA+G1VyX2mBb3Rpl1YnSHFfJ6Wjg== X-Received: by 2002:a5d:44cf:: with SMTP id z15mr1696767wrr.205.1607507615733; Wed, 09 Dec 2020 01:53:35 -0800 (PST) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id g184sm2319725wma.16.2020.12.09.01.53.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2020 01:53:35 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Dec 2020 17:53:10 +0800 Message-Id: <1607507590-19938-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> References: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavfi/dnn: check the return value from sws_getContext 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 sws_getContext may be return NULL, and it's will be dereferenced, so add the check. Signed-off-by: Jun Zhao --- libavfilter/dnn/dnn_io_proc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c index db13d7f..c9b49be 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -41,6 +41,13 @@ DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void *log_ frame->height, AV_PIX_FMT_GRAY8, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32), frame->width * 3, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width * 3, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t *[4]){(const uint8_t *)output->data, 0, 0, 0}, (const int[4]){frame->width * 3 * sizeof(float), 0, 0, 0}, 0, frame->height, (uint8_t * const*)frame->data, frame->linesize); @@ -64,6 +71,13 @@ DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void *log_ frame->height, AV_PIX_FMT_GRAY8, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32), frame->width, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t *[4]){(const uint8_t *)output->data, 0, 0, 0}, (const int[4]){frame->width * sizeof(float), 0, 0, 0}, 0, frame->height, (uint8_t * const*)frame->data, frame->linesize); @@ -97,6 +111,13 @@ DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void *log_c frame->height, AV_PIX_FMT_GRAYF32, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width * 3, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32),frame->width * 3, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t **)frame->data, frame->linesize, 0, frame->height, (uint8_t * const*)(&input->data), @@ -121,6 +142,13 @@ DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void *log_c frame->height, AV_PIX_FMT_GRAYF32, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32),frame->width, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t **)frame->data, frame->linesize, 0, frame->height, (uint8_t * const*)(&input->data),