From patchwork Wed Apr 29 15:14:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19373 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 67D1F44AEFB for ; Wed, 29 Apr 2020 18:14:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 451AA68BFAE; Wed, 29 Apr 2020 18:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 122AB68BDC6 for ; Wed, 29 Apr 2020 18:14:25 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id d184so1216909pfd.4 for ; Wed, 29 Apr 2020 08:14:24 -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; bh=eiwAIQYko5zufSa6Bo69SquaIhafeOghOonsqrZyD6A=; b=hO8FddW//zPLliPefRE+mZPvmZtvZRdBsqc7dcemnRTUU0/UgurHgpBkGAkdX3a6QS XI0DQU3quww0XzCYau9mI0LsnAIyfnd4OLzBtjQU+TGbzjh9+qLtouXMY/R2Ehc8Z8Fa kZ4eIpZcK0vzsLzq2G348AM8vDxWq77hch77uFPE4xsyrEyrRYWqPox9eosX6W0aFzyZ frwsKxbfVk5LUU5/hhdI3xtra6FJdr+6P/ehPlQhXMjIaIl3gnP+7VZbslDWIMJzk2F1 bxW95ZjJbbPUwnH22u1dvIDozxksTz2InjI0Xmww4XZ+8nVzyJPtIBf0Jh4SIORjnyym ZVTQ== 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; bh=eiwAIQYko5zufSa6Bo69SquaIhafeOghOonsqrZyD6A=; b=Zwvb26FxcVN0oZkVw96IzJko5UYCK0+Zr5Xdo7HP/ZRFlzlvn5A1PaRUn3xxud/x+y yOC4oCyKcJLmlmXov7N72T1YOJz6hkwljz33ZNQQVWxPm7gmiSmNeh7HQm5abHS11Ql8 f3OmAhIDr4bGA1ZdKBnBrVzjFs3UoH7Ea4YTpITwe3H8T0jKgvbXPh0aNR7BvKR3jUjJ K7dIL/pYQNBxFD23feSU5rv8GpJRvGyMwi+xb6DQWE4/9gMQT2lgTBdaikYisaMvYiW3 bN1B9CgDQbrGc3QIvEcvH+bxa39jgG7p0J+4IPoXFRAzwhBUIFXSIpNpcGmzJfgcetcr ZlJQ== X-Gm-Message-State: AGi0PuaquDAZuI3fvr/K0ekf+5NDsE6fBfBU/IsR60CGf50IyBKrweEA jMnpKlxN5kOKLA5F65XYoz+TN46A X-Google-Smtp-Source: APiQypKmEG/5qzoO1OdjWucGX7wRZYizoRsmWwjAi3IpKK9UzULP8Xvc7flwbgFKBiPQN0RiR6s96Q== X-Received: by 2002:a62:b618:: with SMTP id j24mr5543434pff.16.1588173263229; Wed, 29 Apr 2020 08:14:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t12sm1243688pgm.37.2020.04.29.08.14.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 08:14:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 23:14:13 +0800 Message-Id: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/dashenc: fix invalid pointer access if avio_get_dyn_buf failed 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang If an error occurs, avio_get_dyn_buf() will return 0 and buf is NULL, so it's necessary to check the return value for the following code will access the buf pointer with index. In addition, the buf len should be greater than written_len to avoid the buffer overflow access. Signed-off-by: Limin Wang --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 9f83785792..99fb7d67af 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -2260,7 +2260,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *buf = NULL; avio_flush(os->ctx->pb); len = avio_get_dyn_buf (os->ctx->pb, &buf); - if (os->out) { + if (os->out && len > os->written_len) { avio_write(os->out, buf + os->written_len, len - os->written_len); avio_flush(os->out); } From patchwork Wed Apr 29 15:14:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19374 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 35CBF44AEFB for ; Wed, 29 Apr 2020 18:14:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20E3268C073; Wed, 29 Apr 2020 18:14:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28C0F68BFDA for ; Wed, 29 Apr 2020 18:14:27 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id t16so937403plo.7 for ; Wed, 29 Apr 2020 08:14: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; bh=hYpNYoaanaaFOhbhHZ/on4Vz3amNnLR6hCRWPG2o/IU=; b=WwHuMk/tYG/MHQBE2elwWdFVfy+79/Jm5YGcPECAmsZkyGEygf3c7sIwXdUol5p/5S 5o1PhquU6cQEBeHpVAdg69Ruipf6/JEa/1PyQrfPJUSDgwXK2fFVZc+FCS1h4gqeGcii FEBhkA3hxuPd6I4AKTUcvY+5Vd7FnnkMNkZYlFUYCQnal75huV2GtVMCKfJzlrS2P9ZF eET9lCOVXysLcZlVzrwpDeBUepgWxXaPHoHfRCYWeYjA1tr/eDlb/xGA8imvtX24ZltK yvEcOCFMid05iLDwIDjkPYoJRR5gDy4L9gyjNEwNJKwLaCQPPs/IYuwdsSUeC90VhCXe y9Jg== 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=hYpNYoaanaaFOhbhHZ/on4Vz3amNnLR6hCRWPG2o/IU=; b=kq4f2COcL6GHZ+7qIHJxcLzsb/ncN7MPNit2DqLktJVzZvgmks5ZlBVQE7AuLMhQR0 mMBceg87HSHUMrSxRCSJ+kjVtITF6xcA9VmDPhyDxAsS05DcMQv3xYOsfmol+/UV1UqD NnSiixNwYdbybCZzVGp+V4QgTgkpdKiqzEkwfJ2Gij+fa4vZs17RhLpY2ShlynAZaiXU SRACvNH+qb5X0QSW0stk4g7AbZ7P8VgHKGFg/BUgEfTvsNx3RZWe0ENOK4A5z4FZG+gA Y2XnI680pTmY9DnsbRXO8rpOV5bv7jRoV6harnO0/zXVNNvAyEWwi7efXIv4Tgmo7BDe MfTQ== X-Gm-Message-State: AGi0PuZrJnxphiAFmkWvwpOIIUhuE2C4LKRTO9FzbD6Z9cnxQZX3E2/4 ZqH5+PJYyjBLiPRmzytAqqah0DW8 X-Google-Smtp-Source: APiQypKqb9PomEWUqOnFcIase+OVX8XVGnyJvHYC3t98xKmtEZHqM0CJeXhEOVKQyNuySuh8mwVDog== X-Received: by 2002:a17:902:fe87:: with SMTP id x7mr34482692plm.282.1588173264845; Wed, 29 Apr 2020 08:14:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t12sm1243688pgm.37.2020.04.29.08.14.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 08:14:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 23:14:14 +0800 Message-Id: <1588173257-14531-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> References: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/matroskaenc: fix invalid pointer access if avio_get_dyn_buf failed 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/matroskaenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 784973a951..f0474da44f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -374,9 +374,12 @@ static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, put_ebml_length(pb, size, length_size); if (mkv->write_crc) { skip = 6; /* Skip reserved 6-byte long void element from the dynamic buffer. */ + if (size > skip) { AV_WL32(crc, av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, buf + skip, size - skip) ^ UINT32_MAX); put_ebml_binary(pb, EBML_ID_CRC32, crc, sizeof(crc)); + } } + if (size > skip) avio_write(pb, buf + skip, size - skip); if (keep_buffer) { From patchwork Wed Apr 29 15:14:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19375 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 19F8844AEFB for ; Wed, 29 Apr 2020 18:14:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFF0B68BDC6; Wed, 29 Apr 2020 18:14:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52AD568B994 for ; Wed, 29 Apr 2020 18:14:28 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id h11so929298plr.11 for ; Wed, 29 Apr 2020 08:14:28 -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=hGltd8ZlPHnrOld0wggPo83xC+9XBWIGZei8yvUjlm0=; b=bDK7MeXHRxQ1KHPu4TYMswBSb1YKyFs99nWxAsDOLD/z3lHJpxVNtIF5iyzyla44zh LlMi/cDZSDGBPNXFP8VyNu1XpX8GQqbkGfyzyDPqSQrHfmftvHtgDcnpS7RdvLpNN5m7 ihz+KBjR1A9UkMzKu+8WWnOW26QJeDZTmTt1LaR0oO/9q9L4BcmfNXQGXDys04axVoVe n1JR+nsHmaRs7iKBL2zUM491F5cMFd1ilCDHP8wkBgJV9JwkTvSC6eWj1bPE0wBGH9V8 ylJVA5xFjA8UjTFmbmO4WZF4Gj7pp5VB2CqRy6QFzQLpNytWDEVv5C0nNGG6kIxmK1pM UTvA== 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=hGltd8ZlPHnrOld0wggPo83xC+9XBWIGZei8yvUjlm0=; b=Vi8Wf9+8wkXSvx5Km/KihcyJnIYUrChrw+LyXF2KeKo4XxlLqN+31ES2CuSHCHlKSF duEruSz51h9LMiVGmWLUck3V66Pg7LOvrYW58OkJ5wFsFpoR0Vdd76fhQ1RBndmoyBEF qBDbpaTNx2sYx6+5fnmEW7kKzGRl02Er6VWGXuz95s81oGhzS0CbDAxOW15auFWgrmgY T3mHPBr3H5z9lvIUFUQSwzNXCoOhacuHXbxEhUWmm+HrQAwD9jxzbsTy89n30NrSgTNe v2AXz9UOMbGAXPEbsJ2+cIIxYZjtOzt8UzIw2lFJcZiLmzM7laIFCaSUmWOR5YDXzaiZ yGJw== X-Gm-Message-State: AGi0Puak+H7LcTZJSLckwTTgEFexgBRsiyDUia7gnzmHJrF5OYqRBIKc 0ZbFEkgv9HuvUQ8L4Owg9GVFLych X-Google-Smtp-Source: APiQypLcaCqupIM6fyBCY8e/9JQixxZWzo5esqVdSmPpPV4Uvf/jFuXfzKuY89xlHN6M8hrN/ayRuw== X-Received: by 2002:a17:902:bb97:: with SMTP id m23mr11471019pls.253.1588173266426; Wed, 29 Apr 2020 08:14:26 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t12sm1243688pgm.37.2020.04.29.08.14.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 08:14:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 23:14:15 +0800 Message-Id: <1588173257-14531-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> References: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/matroskaenc: reindent after the previous commit 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/matroskaenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f0474da44f..41446c3825 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -375,12 +375,12 @@ static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, if (mkv->write_crc) { skip = 6; /* Skip reserved 6-byte long void element from the dynamic buffer. */ if (size > skip) { - AV_WL32(crc, av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, buf + skip, size - skip) ^ UINT32_MAX); - put_ebml_binary(pb, EBML_ID_CRC32, crc, sizeof(crc)); + AV_WL32(crc, av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, buf + skip, size - skip) ^ UINT32_MAX); + put_ebml_binary(pb, EBML_ID_CRC32, crc, sizeof(crc)); } } if (size > skip) - avio_write(pb, buf + skip, size - skip); + avio_write(pb, buf + skip, size - skip); if (keep_buffer) { ffio_reset_dyn_buf(*dyn_cp); From patchwork Wed Apr 29 15:14:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19376 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 145AC44AEFB for ; Wed, 29 Apr 2020 18:14:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E899568C084; Wed, 29 Apr 2020 18:14:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFB7668BFDA for ; Wed, 29 Apr 2020 18:14:29 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id c21so944538plz.4 for ; Wed, 29 Apr 2020 08:14:29 -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=/fim3QIYV28wT3JE9H6rtaT3cU94ZGi6hvxKLN2uHYY=; b=UbpJd8j2fKSpZd/vJ66KUAr5DA5TjA0uyVWd2B9Zkb20m2iy0Ph1BhABdqTNsfF2zQ aD1+gUZqk96RAf3xoy0KpFp/BBU0wyJUY79sKrn7x6lgGg47NdDGvbqGOQWIiS5j9zej 5auME63y15eBt6INKoidtRNN2RklM8hYW9sgTMSn3LAPbqMF68kIem+Cgho3cRg40EUX 5orwNKi2ZYzM/dwCwUXBTq3RrjGaCGNfRKUziUkZnGfxpaVJ+xz2GudNZxQlq7SBv+T3 Heuac5XGXeHVBCJppytRvsxGG3h+Kf5HYCj8weC3n0XNenn2duPSck/Qg+RQIY3bFw4h TANA== 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=/fim3QIYV28wT3JE9H6rtaT3cU94ZGi6hvxKLN2uHYY=; b=JA7B2eLcai08NZQpll4WR/PIw5ojuIidaFyWtN3mC+dkleIjeoerXRzpeSIT+uvpdC OdE2KHC5DOI7Do08EBLETcfYzZO+2E58CvELC/8xvqnnl86Kw2EmhlKOeoLEdO1hZGai mMBXvKguzZWLlmQ/FDFvMzxTFKcZdFOoh1JupkpkdZHDVEONcgn5oFMEJkoZNGaGqcbm f1oS7fqSGlSHpGyhVgyeD9PyjiGpK8GrorbrGQ5GK+NF8P/0019DjOIjf/8PuGiWQHZr VhCjQagpbBkb8MDi/LS04pCJ2XvpF1WkTS4Cn5J78iCLC086QqRwpkB2CEzb7vMqGqLD TxfQ== X-Gm-Message-State: AGi0PuYWksjmGNEN5Uzap3bBgUV7h0qvwHthQWNnxeokuYXhlyQziXvS AdWnXOsvY2x8LZ2HHBHZeLWTKNF6 X-Google-Smtp-Source: APiQypJWnAVIMTY/8gxJ0upWwPMVku9vLbmL49regDXHVbBa1oZhYfn9gVSEFDz/fF5wgolv/Xug/Q== X-Received: by 2002:a17:90a:840e:: with SMTP id j14mr3634073pjn.85.1588173268042; Wed, 29 Apr 2020 08:14:28 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t12sm1243688pgm.37.2020.04.29.08.14.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 08:14:27 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 23:14:16 +0800 Message-Id: <1588173257-14531-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> References: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avformat/movenc: check the return value of avio_get_dyn_buf() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/movenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 32e8109268..1a97e7c883 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5251,10 +5251,11 @@ static int mov_flush_fragment(AVFormatContext *s, int force) return 0; } - buf_size = avio_get_dyn_buf(mov->mdat_buf, &buf); + if ((buf_size = avio_get_dyn_buf(mov->mdat_buf, &buf)) > 0) { avio_wb32(s->pb, buf_size + 8); ffio_wfourcc(s->pb, "mdat"); avio_write(s->pb, buf, buf_size); + } ffio_free_dyn_buf(&mov->mdat_buf); if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) From patchwork Wed Apr 29 15:14:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19377 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 C3E9644AEFB for ; Wed, 29 Apr 2020 18:14:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0C2468C08E; Wed, 29 Apr 2020 18:14:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8400068C082 for ; Wed, 29 Apr 2020 18:14:31 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id h11so929351plr.11 for ; Wed, 29 Apr 2020 08:14:31 -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=XfN4JbkUSLgBQqfEO2OcZ8BzMTmIwKxjHNy7CESaRUk=; b=YbsK+N9e9ZqZKcLfp7F9jIEbmsSeoyZHQ9j6WDZGb/0PC5+j5qHDZG87RRI3N4twzB di36dNCkLMZZbzfF+E6IgWwF57R0K+ayACRWJEaoVeO4F2I7bUJfhcwfzEbrtQiPB2u0 sNSVdZLLdJSxJAPIMw9GgEvHKa4X6UovzeXOnKXr4km/QDmUDV0Jj/pngPJyUcAc7y3X YruFzS1UxIoX3JNVAwVizyMwXuwynaZKssPo3JBBnozg2U++VLYJtFEVhd+HEESC9+0Z cuntlJvwoEMZ+FRWgTvRzmv0KEBvS/86T4Q4f61ajyGwL/ksGfbY1AzlnyE7re/6E0Qs csUg== 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=XfN4JbkUSLgBQqfEO2OcZ8BzMTmIwKxjHNy7CESaRUk=; b=Qp9rhwuSrZH1JQ8QGw4PasyM3g511LLE0TuyyGo1bBwhRJiiFrzcmBZXS1GLJQoiu0 W17wYACtGy5rAukhIc9MO9YGFeQK1OkfFGTpD0t0YhozW3Kd8g90THYbOfVm7i08eeRh XFem6SfBkNwzLWSIEOkvt1BVBOp2l3AVWS25gNI5C/cA2NRD+3E7SCmssQ7ydp0An1cy c/lq4d4wZi86BIACt811RD0U7tmTFwONcux34HAPxylsnx3MlP58QxmatTrJ84jbsNOU 16A099A/en3/YUMfKn+uff9XR5CU94WHm7PsnzlzENMCh1XjHzNdbBbLiCi6llwiLtTK uEfg== X-Gm-Message-State: AGi0PuYiGwI7r9zDYFKtYWYBwbB+bsB/wkjnIWdcoaL0obg6VBJWzowu +Sk3JiTvGFL+SsaV9o9FEbKSG74d X-Google-Smtp-Source: APiQypKoOQkLwo9y4GUzTn2B6OCdL0j1xqaW9SiC97l8Zk8ghBCyPz9OatYZRh72Vc+5Ccz9eJjvWA== X-Received: by 2002:a17:902:b186:: with SMTP id s6mr35502180plr.16.1588173269733; Wed, 29 Apr 2020 08:14:29 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t12sm1243688pgm.37.2020.04.29.08.14.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 08:14:29 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 23:14:17 +0800 Message-Id: <1588173257-14531-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> References: <1588173257-14531-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] avformat/movenc: reindent after the previous commit 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/movenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1a97e7c883..ad04143f14 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5252,9 +5252,9 @@ static int mov_flush_fragment(AVFormatContext *s, int force) } if ((buf_size = avio_get_dyn_buf(mov->mdat_buf, &buf)) > 0) { - avio_wb32(s->pb, buf_size + 8); - ffio_wfourcc(s->pb, "mdat"); - avio_write(s->pb, buf, buf_size); + avio_wb32(s->pb, buf_size + 8); + ffio_wfourcc(s->pb, "mdat"); + avio_write(s->pb, buf, buf_size); } ffio_free_dyn_buf(&mov->mdat_buf);