From patchwork Sat Sep 2 08:23:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55928pzb; Sat, 2 Sep 2023 01:26:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFf1YFhyht9XBbTb1ntSiGwlw7jZth/n28Web0AxiyyBOoNVYqoW02mnM7p9XCLZ3Nj35rF X-Received: by 2002:a17:906:113:b0:99b:4a29:fb6a with SMTP id 19-20020a170906011300b0099b4a29fb6amr3409872eje.59.1693643210295; Sat, 02 Sep 2023 01:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643210; cv=none; d=google.com; s=arc-20160816; b=fmRBirFgMwNn+BluumPz7or8uh54bmS+fpW/RxRdfd8biwLl/aqE8tH9jNqO40Ooma IyQMejZoeXHU4STyzbme3i0XExlq383fWmjuwali+45LnWWfylv+Rn+LYH9soaodOE5C t0prqc4wu1r+zRVCH4y9NN1bXhdvAWznxdRcSkhVRGDIm48LVxPl2NmBweeysAkZxZer Wm4R27wvLds1DEBdHFt+DlkO9mhgMDu0p4c3w1C82xld5FG/yWx5A3E9P2BwLQ/b6mbP j2GWTh5nZDgIbm6C9rU5KGK+54cHdTf4a5X9sTWdrmybQgWE7EbZyRFYBuL28ZXCF/eV 6a2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=gLkQqBc2GJ1Z1pBpjutWYrIZrj4pEYOz+3z7bgCfNEM=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=sbP6jZhxBHcZJwP692Fifab+EvkbDJkNTff8S0+As8s5BrQNeC8DfSWjvSHnk6T/LN SiQz7pks2Y9iDkXzhkP4+DbTRrU90ZfrR0bLZoeqOHPsWUhoRYc3Je4UVGe2+vnvIcV0 OIqIEsAh3C7SfSiv+Ab377FPzwAVnhGHxYAPputr7nAUO+1rKd4pFN/nhkaWGXNaw61J KNItlKAULOJUOkNRX6B4ss/7rPd6X5UR7LCz9Cw+n2wWfx6tu8TDArvgOSF7loDy+5+E VOYXQZ0/RIA32R2BrJNE82Dk0y3iIy6gTLKLyQagGYBrvV/qmCflWgEMrYgd7qlJ/vaz KPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aqEmRuIX; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h26-20020a170906829a00b009a1e1f4139bsi3301688ejx.29.2023.09.02.01.26.49; Sat, 02 Sep 2023 01:26:50 -0700 (PDT) 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=@foxmail.com header.s=s201512 header.b=aqEmRuIX; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E965F68C7F0; Sat, 2 Sep 2023 11:25:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30EE168C7CA for ; Sat, 2 Sep 2023 11:25:16 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643104; bh=42+YSOyYxd9bLStdE1qjM7mvK3hH3pRqNzpdtWq5pOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aqEmRuIXteFpMoNiq2ycCahD8Cj6UDZBWlHtpK6Z1o9KiZaMU2x70IIfd4hpbEaA3 8Epd9680XXTHxMkrAOJPkXNyeHFGu4acmB7QM2eC7NKcsEE3NDShSiHVBOsGSylnFm SQmz0AoB9KHlU6HkkpYEyiObSgZERnR5bzxQAK+E= Received: from localhost.localdomain ([113.116.30.246]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 640954A0; Sat, 02 Sep 2023 16:25:00 +0800 X-QQ-mid: xmsmtpt1693643103tl50ezvzp Message-ID: X-QQ-XMAILINFO: MYcyYH/A/+tC6LI44gZ8hJAg4HBHYZC3pZyNXK4fJpKrmn6A32n/2SGEY518A2 3QpTkfdMm1qhTWJhJqrCRwSlCdUprLjutcXxs6h8Gha9coaTnEtCslJmuW0la7Jzh5Hl3+5GckkT Z+5+gy2KKnBBx0IS+zU7eyc8Bx5pLo+M6dFwABs9/y1pYaz6FPUsimelmOJ/T08B5nhv7ClZCpk/ O038RFYjQQZhjo+K6xLvu+8s7XWBZqRd8ZBBw7y+RyhxOl94mCasFmkHJFx9bz5oXCFizA6XITpH DZrUvMByPWwduL13mSlQxFbR74/18Xnva25+fErktS5jl355F8CKTgO0xFkZhbu55idQ4540kWL1 Dro1qpgQBEd20+A2HkX95Q9hA1j5SQ1jvl5P7YEGsra88nXiUy9UgfvyKGFbnr4pnc+I3DhouM6K qMl1A66y5QRNkKKBPv2qTUJVB6XbRIEXITiNyEnIPWZaQw82ItG5BVOVOamUJimwUyEA8WxY/u0f ORpEo6BUlSKOcC2W3EZjCBVDMxTWHqpd6QHcJzbTzR0jaV1JcbcfXJCvz5LNg+/gJf8+hKpqJo8z jzLcS/gXUFYvEbGsQzC+M+/kxc3rnPEDmNQl2nWoqqZvrx0j7IbTdS+kNLaFMipd2nzKZY1ADB5i drr2tQbdCy2u1+5Bo6Uynj/Osn6UCaGzE2RY4nA8ZRdNQfwFsyfleUdSIoEW99/5qIC062BFH8CK eME8I306ZMfgVHPCj9pgkoSZ6pZi9SN9Zx/ZFUZfmb6/8G6JpgRTjm+P0cuvpax2Jg00raOpw3fm UHtZEXIzsbvTye8IZeeKejW5BdrlWXS0bdnneeQWYS67IwAt3uct04lJrklhyhwUlaf7eTAl73kJ 7dCBVEswOhj+udFpTqvgunmwOM+tjXjiPDLY3mGq2aTy6SOvCs8XomwytPUFUa3R8WLFGLe8DfeC szO0vCq91OLEkVQZDAYIUZh03pv4UZVCMTHSezEWA= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:55 +0800 X-OQ-MSGID: <20230902082359.260925-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902082359.260925-1-quinkblack@foxmail.com> References: <20230902082359.260925-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/8] avfilter/dnn_backend_openvino: fix use uninitialized values X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: I2Y2LS2tXJic From: Zhao Zhili Error handling was broken since neither `ret` nor `task` has being initialized on error path. --- libavfilter/dnn/dnn_backend_openvino.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 85db4ecd35..7150bf0886 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -1090,37 +1090,37 @@ static int get_output_ov(void *model, const char *input_name, int input_width, i status = ov_partial_shape_create(4, dims, &partial_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed create partial shape.\n"); - goto err; + return ov2_map_error(status, NULL); } status = ov_const_port_get_shape(ov_model->input_port, &input_shape); input_shape.dims[2] = input_height; input_shape.dims[3] = input_width; if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed create shape for model input resize.\n"); - goto err; + return ov2_map_error(status, NULL); } status = ov_shape_to_partial_shape(input_shape, &partial_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed create partial shape for model input resize.\n"); - goto err; + return ov2_map_error(status, NULL); } status = ov_model_reshape_single_input(ov_model->ov_model, partial_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to reszie model input.\n"); - goto err; + return ov2_map_error(status, NULL); } } else { avpriv_report_missing_feature(ctx, "Do not support dynamic model."); - goto err; + return AVERROR(ENOTSUP); } } status = ov_model_const_output_by_name(ov_model->ov_model, output_name, &ov_model->output_port); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to get output port.\n"); - goto err; + return ov2_map_error(status, NULL); } if (!ov_model->compiled_model) { #else