From patchwork Mon May 4 18:22:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19502 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 77DCF44AD26 for ; Mon, 4 May 2020 21:23:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 65C4968BE75; Mon, 4 May 2020 21:23:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3393068BEA3 for ; Mon, 4 May 2020 21:23:27 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id g13so240676wrb.8 for ; Mon, 04 May 2020 11:23:27 -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 :mime-version:content-transfer-encoding; bh=2+2N57/MmozmQjfh5ojiXP4/xQMfN4J2tl/3i8GFUlA=; b=nM76htSh/REUtv2gcJdcOn+CqNWekZbuct8iYhTHIYGbTCeHw9jHd2r6Nb0dtreEJG rA63Tf5T6iXg06k67DxT8Tyi2lKy2H0mTmhwqaAZveid3t6tnvOCCzHDdUSV9QXKksF7 7sqzp1x62qL4CWndsJvgI7gvYJoOlWp+4tumO3Ed2czseD8qScD6V1A2dppRWenEC14e ddwGfQs4tJ/QjWNwYPu/c7n/XcOMJROjNXsJTDaarNQUxH/Nhd8J1WFKDlxlVbMR9382 Jb8FCqDA5oRmk8FRBiQ8PWO1+M/XoChF90qJjh+QYWJ0GWfTCbLdn/GpqjI/PhGEs+TA oSdg== 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:mime-version:content-transfer-encoding; bh=2+2N57/MmozmQjfh5ojiXP4/xQMfN4J2tl/3i8GFUlA=; b=RpXhRAPOzrJsx/sRGmRfy6GYEO7v+K9N75evmBhIMNb9CDL1v64lM++MufboGfT9zL 7eF9K/T8poG9ACtbmrwnxZn3sf/3MHDfM+AWDQPyT2f9kVVeEBMMuRQmajGk8HYH51fW dyKn4gJRdOU4UU7TbQ3IBNPjz8hlMiX9L6Dmq21KXN6gfWwE9fd3u9hOOojQ2Sb8xIEb 3WjE9o2+BsUZMQQEAPdZ3Zl4AjQf6CjztD6nKquePFBTKNiMDb2QDrP5r+FGSKFDj+u+ M4rNZkPJL/y8uYWruQ9T3kLgtgtfMVj1Sa7aKUgILXfJ9rJMpMLIq5QsfTvC8xeqrRb1 +8xg== X-Gm-Message-State: AGi0PuYIzGuUL8B8Uu31yldbzbmilryOLF9kF73UMxrbGAuk7pfC0xSY YtXi3pVBMKJNTvgA95WoqWKW3Pwb X-Google-Smtp-Source: APiQypJToC6g8iWqRualQN0KiBfn398zVN6AhM1FeW8SJ+9ESHSsxAtt+FQO6gg6PC3qY3UTFUBbEg== X-Received: by 2002:adf:f24b:: with SMTP id b11mr389419wrp.313.1588616606142; Mon, 04 May 2020 11:23:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id u188sm358595wmg.37.2020.05.04.11.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:23:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 May 2020 20:22:47 +0200 Message-Id: <20200504182250.26141-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> References: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] avformat/nutenc: Check allocations implicit in dynamic buffers 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" For nut_write_trailer() this includes actually returning such errors. Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 404a265597..ab44214efd 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -331,13 +331,16 @@ static void put_str(AVIOContext *bc, const char *string) avio_write(bc, string, len); } -static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, +static int put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, const uint8_t *prelude, int prelude_size, uint64_t startcode) { uint8_t *dyn_buf = NULL; int dyn_size = dyn_bc ? avio_get_dyn_buf(dyn_bc, &dyn_buf) : 0; unsigned forw_ptr = prelude_size + dyn_size + 4; + if (dyn_bc && dyn_bc->error < 0) + return dyn_bc->error; + if (forw_ptr > 4096) ffio_init_checksum(bc, ff_crc04C11DB7_update, 0); avio_wb64(bc, startcode); @@ -354,6 +357,7 @@ static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, } avio_wl32(bc, ffio_get_checksum(bc)); + return 0; } static void write_mainheader(NUTContext *nut, AVIOContext *bc) @@ -644,28 +648,39 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) if (ret < 0) return ret; write_mainheader(nut, dyn_bc); - put_packet(nut, bc, dyn_bc, NULL, 0, MAIN_STARTCODE); + ret = put_packet(nut, bc, dyn_bc, NULL, 0, MAIN_STARTCODE); + if (ret < 0) + goto fail; for (i = 0; i < nut->avf->nb_streams; i++) { ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i); if (ret < 0) { goto fail; } - put_packet(nut, bc, dyn_bc, NULL, 0, STREAM_STARTCODE); + ret = put_packet(nut, bc, dyn_bc, NULL, 0, STREAM_STARTCODE); + if (ret < 0) + goto fail; } write_globalinfo(nut, dyn_bc, prelude, &prelude_size); - put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); + ret = put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); + if (ret < 0) + goto fail; for (i = 0; i < nut->avf->nb_streams; i++) { ret = write_streaminfo(nut, dyn_bc, i, prelude, &prelude_size); - if (ret > 0) - put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); + if (!ret) + continue; + ret = put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); + if (ret < 0) + goto fail; } for (i = 0; i < nut->avf->nb_chapters; i++) { write_chapter(nut, dyn_bc, i, prelude, &prelude_size); - put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); + ret = put_packet(nut, bc, dyn_bc, prelude, prelude_size, INFO_STARTCODE); + if (ret < 0) + goto fail; } nut->last_syncpoint_pos = INT_MIN; @@ -1170,11 +1185,11 @@ static int nut_write_trailer(AVFormatContext *s) if (ret >= 0) { av_assert1(nut->write_index); // sp_count should be 0 if no index is going to be written write_index(nut, dyn_bc); - put_packet(nut, bc, dyn_bc, NULL, 0, INDEX_STARTCODE); + ret = put_packet(nut, bc, dyn_bc, NULL, 0, INDEX_STARTCODE); ffio_free_dyn_buf(&dyn_bc); } - return 0; + return ret; } static void nut_write_deinit(AVFormatContext *s)