From patchwork Sun Oct 28 03:05:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10814 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 C814044DB92 for ; Sun, 28 Oct 2018 05:06:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A31B689EB8; Sun, 28 Oct 2018 05:05:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D01EA680983 for ; Sun, 28 Oct 2018 05:05:31 +0200 (EET) Received: by mail-pg1-f177.google.com with SMTP id o14-v6so2268898pgv.7 for ; Sat, 27 Oct 2018 20:06:02 -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=PIyPakgZ4fp5BUn0fYYetD0hXOA81LsTmH/01+XyjgA=; b=Uc+3LlgGu2j1MvgZ+mzKXzbAZtTfMLI5ttWzOMYPxwQmmxnqB7KKqm+audJERDDK8v da1kK55+LMtzaKmzUXQYl3Xox0Rti0nrlYK885aXaer5RC1ff2q+oE8Wh9g7ZtyoSd1i oADXsX2DQ2ID1AWQNDU/pfHH3T0kCJ2Jb1ylh9Ban5PbPnnHiDl45RtQil3v/RJsFyWb zDDkuBI5uq92tJBTXFFRZ2fW2NA3hBUB6G5jT6MkVHKG/w0V6R8HU1EytC1V3CxdWb02 /nf4KiQ1DfnO2WRa7tv3R7lQJs5SyQPRftg4lK+OFe8h+Yjyw042lmgngHYw1A1K+R7q Fgew== 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=PIyPakgZ4fp5BUn0fYYetD0hXOA81LsTmH/01+XyjgA=; b=UdyN4Ce5M/mPHeTuCWVIwqe1HNe4Kmk5gl3AwBQAV+Z6sQl0rY/v/RvgXxDsWMxKYj ZIkCjfNGANec3s6RrOM+fnZZNgGeb2n0yyjqhfbFO4aAIb4aspiQbQtPNqNc6flZn3ER h92xv4KfNWfg04KutHbbQxHj1AvGsEG+hPeYV8+lRwQ+DGzVxsej9ArA44jBe3dOKGCL NzYCTqZzCRQlr6KjjPV37vVBz4MJzj04Zspsw5SrRFkyhUl0cixQWL6RXOFIkdtQFk2n QHLGcUR68REwvln9gkpqo10j1Q/ZK0bou3id194+4Vfl63a6JpN/qXQx1ykY550dBk0H gwfA== X-Gm-Message-State: AGRZ1gJWYBMOSNRiJvMN0m9xFVsaEJ9qijHaGgCBbElCQwJPo/JIEvYw hqsxNGJP2YZ0dNgGeh/YFBPgekYV X-Google-Smtp-Source: AJdET5e/FdPhuTOhK4vFUrwcyBkBJoUWUGY5zfHKT5sY7yV+9fsqlQKE2/5ULtm7fMacMA/7RsRqoA== X-Received: by 2002:a62:36c3:: with SMTP id d186-v6mr9514743pfa.133.1540695960359; Sat, 27 Oct 2018 20:06:00 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id l1-v6sm17173540pgm.8.2018.10.27.20.05.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Oct 2018 20:05:59 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Oct 2018 11:05:47 +0800 Message-Id: <1540695947-26873-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1540695947-26873-1-git-send-email-mypopydev@gmail.com> References: <1540695947-26873-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavu/frame: Add error report if av_image_fill_pointers fail. 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" Add error handle if av_image_fill_pointers fail. Signed-off-by: Jun Zhao --- libavutil/frame.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 92626dc..9b3fb13 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -243,11 +243,13 @@ static int get_video_buffer(AVFrame *frame, int align) return ret; frame->buf[0] = av_buffer_alloc(ret + 4*plane_padding); - if (!frame->buf[0]) + if (!frame->buf[0]) { + ret = AVERROR(ENOMEM); goto fail; + } - if (av_image_fill_pointers(frame->data, frame->format, padded_height, - frame->buf[0]->data, frame->linesize) < 0) + if ((ret = av_image_fill_pointers(frame->data, frame->format, padded_height, + frame->buf[0]->data, frame->linesize)) < 0) goto fail; for (i = 1; i < 4; i++) { @@ -260,7 +262,7 @@ static int get_video_buffer(AVFrame *frame, int align) return 0; fail: av_frame_unref(frame); - return AVERROR(ENOMEM); + return ret; } static int get_audio_buffer(AVFrame *frame, int align)