From patchwork Thu Jun 15 15:18:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42121 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp866644pzb; Thu, 15 Jun 2023 08:20:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4l7cZFP1iB2nEDYwkgN2GAmkS+f2hFEjWjWg72Znx2uc8cQsD4WmvOM2AfUpbMH7TfNuhX X-Received: by 2002:a17:907:8a08:b0:982:870f:9e8f with SMTP id sc8-20020a1709078a0800b00982870f9e8fmr3400112ejc.62.1686842412967; Thu, 15 Jun 2023 08:20:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686842412; cv=none; d=google.com; s=arc-20160816; b=DqEfpS1wZNicSg5sGyXlGMlAcLQCc16/FkUUKIVkUqkUx6YXbTGuF8foJ8sOs03A9Z umitJYK9NfqD3g+RyU6OF30P1UJ9rhfhIRNDG8308fkXfuEW480vlNNSoQcwVk0fDptR iBAuB7PePPLTGIf/HzGF/q/xUtnwxnvsnxmvE7iVSd+ppDZ+yNCXP1n8PLolP5Y8xD/J l8tVSyHwNZL2caxcyNHYpKEhLQlYxxV7IswrSdRn2KbQxCS6Fkn4VbGhoXvIFktSD9lo prjSHddMdnN4sh6wSdbCMZDTl5wg+mBTjI8NmKEnqb5AHFiv9Yag9DpWHJLGi2o8BFIn umhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xvPlSuyGxyxCanXnX5hkDbCsW+wYUqSnop2ZiiUbPJc=; b=ChdDGO9aP7yBfPT38cKt4ZufKtDGEfAvSXw3A+b3NCwzwyeyTGZB9nVSmcJuesAZO3 PRTAAq3vrGm8tCyuGpcyisd8HVe0YPcEYFZJ+E347Dqmv+LE5JjQKaB2qBVhTTsRGUwF U9WcPCITfHv46b2ThSmNFZwAnMSlkLl+UnI85rXF1SEF//myM0fYJAwKY3B7fQcbld/2 CtG+kHHRy+DSUpDjbC4W6BVBECXAITz5Sh/DDYW/c8Yjcbfh4zZDLBhEg6sDzvsSutpZ zPBJnLk8Jg0fKmIfN6DFEwUxpA6/KSQj00QQD8fBJjVqAC8phwwOBGEVYBV87oWyxqq5 YBNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=lc2nLgw1; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v24-20020a1709060b5800b00982a1550604si1001846ejg.621.2023.06.15.08.20.10; Thu, 15 Jun 2023 08:20:12 -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=@gmail.com header.s=20221208 header.b=lc2nLgw1; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABE2068C57E; Thu, 15 Jun 2023 18:19:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 991AA68C551 for ; Thu, 15 Jun 2023 18:19:07 +0300 (EEST) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-1a1fa977667so6567164fac.1 for ; Thu, 15 Jun 2023 08:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686842345; x=1689434345; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=byoqdVKqjtqn/mvyHdbPISf6OKQxd7f0CB1jTXfiM0k=; b=lc2nLgw1aJKVWPA7NyGoPDJo3u9a9E9KpwAmkJm2PYbIwo7u88Mcc9LVFvqf9378Wv l4dIhTzEa2m02ozlWwdaXRFUPYmKvh8Mypz5G65JDALrQMrvGXpHyn0PNZNV8bfezthN BjGm2qr35/wNGYARBY1VnYwxj+mVxzgoQ/PZgZUb9aGjIj23y9/mKuLbxINz/tnxqUvv JQ4qyZAHPgMdVxKqIEKzbudPdiJ5tEA0CFdmcDOgeKv+rA0t1Tp1hrlmG8R5iKr8hl0q /hTxxZwxYg5xe/2jSWb/UOZo2vF/pYWAKw/1+HMu/5v9sFCed9RsmqWx9tErabPSK1Fj Eprw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686842345; x=1689434345; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=byoqdVKqjtqn/mvyHdbPISf6OKQxd7f0CB1jTXfiM0k=; b=cwz7m9EUfJHJzyaKBnO4LmHQzM2s6xZmPFCpuTznVm5k4FsxYWOiWm60aVs649BKsv Fwt7KJByjEVgIdzi924rarlelqkBEhnBk/QEpUi0Xkl6evNh+ap8Ppks1z8FBbZjXKvt GU1HGuiTx+s4h9LRRbWAYP0RshIbnH7CTCZa9NsjR84Ql0qcMkJrAG799hpS3rD4ltyU sT2y+HisWXxOv/R+8DVdjsPti2Z1wXpQwE2dLOw1whyE3IkTC0Jjl2tQhD2tnquoEbyO sE5lgc5xxMA/O9HdslgnYOb2rJEigJ27UuBh+3ZWbaJNabAmKxtyHsyX6ULI4v+Ep5Vi A0wQ== X-Gm-Message-State: AC+VfDyvxD30WlCaUnJuPt5yt1loiZ0mD7cvcTLCKLo8zOBpy5zC/5yv 70TgDfFt23D4uLz5D55CAK3YqDe6vvk= X-Received: by 2002:a05:6870:90c6:b0:180:1c4b:fce6 with SMTP id s6-20020a05687090c600b001801c4bfce6mr13355945oab.28.1686842345666; Thu, 15 Jun 2023 08:19:05 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ve17-20020a0568710c1100b001a6a3f99691sm4748405oab.27.2023.06.15.08.19.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 08:19:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 12:18:34 -0300 Message-ID: <20230615151836.50535-10-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615151836.50535-1-jamrial@gmail.com> References: <20230615151836.50535-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/11] avcodec/evc_frame_merge_bsf: ceck for av_memdup() failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eaGuhe5RRIwN Signed-off-by: James Almer --- libavcodec/evc_frame_merge_bsf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index d2746a1ef6..fbb344490a 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -61,6 +61,7 @@ static void evc_frame_merge_flush(AVBSFContext *bsf) EVCFMergeContext *ctx = bsf->priv_data; av_packet_unref(ctx->in); + ctx->au_buffer.data_size = 0; } static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) @@ -117,9 +118,13 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) if (au_end_found) { uint8_t *data = av_memdup(ctx->au_buffer.data, ctx->au_buffer.data_size); - err = av_packet_from_data(out, data, ctx->au_buffer.data_size); + size_t data_size = ctx->au_buffer.data_size; ctx->au_buffer.data_size = 0; + if (!data) + return AVERROR(ENOMEM); + + err = av_packet_from_data(out, data, data_size); } else err = AVERROR(EAGAIN);