From patchwork Wed Jun 24 23:32:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20594 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 DF5FE4491EA for ; Thu, 25 Jun 2020 02:33:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B743A6807A0; Thu, 25 Jun 2020 02:33:05 +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 DF80E6806A5 for ; Thu, 25 Jun 2020 02:32:58 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id g17so1836147plq.12 for ; Wed, 24 Jun 2020 16:32:58 -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=rJWRFdhmSA+qob3pjAeVldL03GLNYGj2k7w6JXyrVTM=; b=TTKkyRSqciBMdP53564IJ5JXhO/g1GbjIJC2L6V4d8fvLMRVkt6rkV77cUuOjyHVb4 QI79VBZeqtaJ3PEeT0drz/jjHY28Yzes6Q2qGGW0DTvMWJ2xoKP3DmokE5FiRZI0L9c+ SwqxkG6pcYTJ5AiCR8DKjVKbempClYTqqwiUavIWlkcAKQW6zWjvViWO8qnfn0hN7H8q V16xcb5XBTBIJnWPDW2jE0A4uzxVludAMlnMntVVi+5le16yEB56HBd2FTktp5l3bIM0 9TgOWLXiUtl+RDSn5Rm+5RlrWJVCWzzrLooE+JLu4bVLgsZakNfxZzvj5pFniMF18vM0 ChfQ== 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=rJWRFdhmSA+qob3pjAeVldL03GLNYGj2k7w6JXyrVTM=; b=jWmlHTFq/TVm4GpGv3nx86Gduv/D2LIorm4ZBFQs5WArrP2rmfok5LahPI5i7iT8IX Jfx2jT4KbfiVJbtOiyZ0Zsrq7Hcwqp4C3q7AlJ0QgnWMER9CzBkRm3nLZ9jgQC/rrsO6 9GbNOSdESOSAdsgaXn9K4k8PP28b8IRYETdckGf2sbq/DbiyUAB1gWKByNmdRdFgt/dI jAqCyklNOmX4j/9CoL3+4bEARnEksVYlWbgbTjBnItlX506KR3LmPruM5pL2ulrwEsBT Vx/SZtjC43KKGuRYptYynaed7wM4++esvYyMrJqYl7ft62oV7yB3NIlkZZK6qOV5cYrK BK4w== X-Gm-Message-State: AOAM533PeYnxmmVfMZHZAgBsK4viT1l5FNfXdzkCzV2ayknRsrL+BxFi 0A6401Zfe34BiM8s9Odzho09nWAw X-Google-Smtp-Source: ABdhPJy8MYX3qdgnT66pHoilRL8dEnH2061yMthSsVG3TZ7YwjIPuNGNKcp7CwrekFgBPeZNMFacfA== X-Received: by 2002:a17:902:bd0b:: with SMTP id p11mr30185718pls.91.1593041576782; Wed, 24 Jun 2020 16:32:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.32.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:32:56 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:34 +0800 Message-Id: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 1/6] avutil/opt: check return value of av_bprint_finalize() 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 Reviewed-by: Nicolas George Signed-off-by: Limin Wang --- libavutil/opt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 2c3f998..c8413fa 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -2120,6 +2120,8 @@ int av_opt_serialize(void *obj, int opt_flags, int flags, char **buffer, av_freep(&buf); } } - av_bprint_finalize(&bprint, buffer); + ret = av_bprint_finalize(&bprint, buffer); + if (ret < 0) + return ret; return 0; } From patchwork Wed Jun 24 23:32:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20595 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 B9FE24491EA for ; Thu, 25 Jun 2020 02:33:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DCDD6808C8; Thu, 25 Jun 2020 02:33:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 522DE6806A5 for ; Thu, 25 Jun 2020 02:33:00 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id g67so1398896pgc.8 for ; Wed, 24 Jun 2020 16:33:00 -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=itr/3jEdQOIV+InW/PxRVnvhmB/Z3UVsHrgTT0S3rXM=; b=H6bNYmjIHbuGB7gC7Ud0d39+OsOAIgL3vSGR656u2t0yOCibwSWjxCb+NQh5vZTV9+ GGpaIvrA60qz6FyOPp1RzSAVtlaLGKB5DMREY7Cp5BGG6FwTI9eR5w+VVur903amKZmW eCibIQtjeCqfbH4dS3g3dfKb2oXyW2GkpDHiUJHn35GwGLdRPaCNRKdIaaNl3JBo7K8X qjdjg+KNcToGB8HzyDjfmRp1ul2oC7SB43gY+caH8y2b4OXt9E+o7lCMYVxe9uByGKsE K25olHMRMlwQJIc40EnIJemSWlihzKcG0CXndP27EtYdkZwN6fNxOVw9Ni7v0uGk4olt 0RUQ== 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=itr/3jEdQOIV+InW/PxRVnvhmB/Z3UVsHrgTT0S3rXM=; b=kger6VoQ2EEDlj5ygOKW8nwo3TD2WtxWCTJOfBXxjEtFNFGrHjI2ACE6JF8fRFek5y 77zbFP4YF0RMMKhWlPw2RnbQnm56fAA1646QjJ6qCARxW7QsgeSOlQ4HaCZWk0lQiRE7 3fK7/4TQ2nL1YrrIB73y/+R3ndo4rYBCGgQ0wfrGrQXhaGKbjIr9E3+Drdkzv1BwDCZ6 SqB7oLR69R0egGoof9spr+mnrX+WhOJdb4LsUxgH+L+nBPKBtSdChprYEJGOPzTvFFiX d/rje8ATNCbsQMulOFtsgG2bdKu4xltozEdoYOf9bSDfoqQ5KKX+CEABWx7cfiemoeNI ASMg== X-Gm-Message-State: AOAM532wYveTpdrlYWhPXEYMdmcwm0s+CGxJWDtcbMTF/CYGLyLVCSHs nNlrB5KwQ9PzWxGC1WrKZZpgui1r X-Google-Smtp-Source: ABdhPJw0GLZK4WoDPjs1hi3StTbKxNevvkqMY7Ngyf9CoNI4Y7ToOja/B4aQyjtOg4T2VYFZEOXqPw== X-Received: by 2002:aa7:8548:: with SMTP id y8mr32003057pfn.192.1593041578329; Wed, 24 Jun 2020 16:32:58 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.32.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:32:57 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:35 +0800 Message-Id: <1593041559-27350-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/6] avformat/au: check return value of av_bprint_finalize() 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 Reviewed-by: Nicolas George Signed-off-by: Limin Wang --- libavformat/au.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/au.c b/libavformat/au.c index 4afee85..ff9176a 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -81,7 +81,7 @@ static int au_read_annotation(AVFormatContext *s, int size) AVBPrint bprint; char * key = NULL; char * value = NULL; - int i; + int ret, i; av_bprint_init(&bprint, 64, AV_BPRINT_SIZE_UNLIMITED); @@ -92,7 +92,9 @@ static int au_read_annotation(AVFormatContext *s, int size) if (c == '\0') { state = PARSE_FINISHED; } else if (c == '=') { - av_bprint_finalize(&bprint, &key); + ret = av_bprint_finalize(&bprint, &key); + if (ret < 0) + return ret; av_bprint_init(&bprint, 64, AV_BPRINT_SIZE_UNLIMITED); state = PARSE_VALUE; } else { From patchwork Wed Jun 24 23:32:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20596 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 C9A364491EA for ; Thu, 25 Jun 2020 02:33:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B26AD68098D; Thu, 25 Jun 2020 02:33:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B14C1680852 for ; Thu, 25 Jun 2020 02:33:01 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id e9so2282081pgo.9 for ; Wed, 24 Jun 2020 16:33:01 -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=XDjTShOmAqWvAUNzd/LFyB0XgPxmHa5Qd2KAMI1+ZiY=; b=r92kIAoAAbFr5UcNttpu675t6rxf1Rg+5emJwpdtuwlxmBo4iOlO3NI9qin/RSSard jxcdLff9t+t3fx1EDCHB52ZDxTqrCcw+0L0YK8ocTTWqSIWNFqKncoxLV/dZ7NqkoMp6 7/zgAwuoaHZwCek1f61slIMwNmds5/z60WYVSVVuO95B2KmnIsZusMnFUomrGf3Ko3AA 3N0f9UlX2J/JHieYo2QfELbC5meKCmKmuM9Vh211adAt5pCx+sUUFzh7b/iJczoerSko OKT2mIvII++uy6Lck1hZ+/r6gfRprUaP7KgJ6gMrChPdBExUeo6jroWLVX8zG3vprh5g frXg== 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=XDjTShOmAqWvAUNzd/LFyB0XgPxmHa5Qd2KAMI1+ZiY=; b=KJrEe/bqYWkF3hKX23Gs/iSE4UZO6pvnIl20c3xeb4f2LiQlVgzQymKMgfvgcGhfzE weKRK9Cmw9e92QvczsmaH4ki+1Q5AjRlCS6bkSQHDl0samhdpFwQFen4tHTRuI06y8BE ZcmHCsitJDefoLk/DuagVmWm91j4/tFJu4IpNe1UCogazgUkJ7QCQJCaK3Yjg8aKXryp 9P3FrBJzf1M3BtOWEkoQXbI8KdZp/mdEGPoVTDWUZ+qWF/rKDwRDjoOYRC1Lm345vNwZ b6SnoGRq6H6gzVLFu30upXN++WRJFAx2yZv/xnvpGBAiFAMvieB6GxHLLaWwYRKBebGl zEzg== X-Gm-Message-State: AOAM533IrSVPXJAfJS4DUPB9LmJG/u0Q+46aB8kusgkN8UhQYbv7CE19 l3kibFGYag51fBd3ddLGu4o2LVSw X-Google-Smtp-Source: ABdhPJwVSKtmyllWnAzMGuiNYRhzODIAwzt61sjsGQe5yuRj47MRXxyuRGAY1tmYutnl0xmXn0iiyA== X-Received: by 2002:a62:140f:: with SMTP id 15mr4419383pfu.50.1593041579896; Wed, 24 Jun 2020 16:32:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.32.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:32:59 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:36 +0800 Message-Id: <1593041559-27350-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/6] avformat/au: check return value of au_read_annotation() 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/au.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/au.c b/libavformat/au.c index ff9176a..f92863e 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -145,6 +145,7 @@ static int au_read_header(AVFormatContext *s) int bps, ba = 0; enum AVCodecID codec; AVStream *st; + int ret; tag = avio_rl32(pb); if (tag != MKTAG('.', 's', 'n', 'd')) @@ -163,7 +164,9 @@ static int au_read_header(AVFormatContext *s) if (size > 24) { /* parse annotation field to get metadata */ - au_read_annotation(s, size - 24); + ret = au_read_annotation(s, size - 24); + if (ret < 0) + return ret; } codec = ff_codec_get_id(codec_au_tags, id); From patchwork Wed Jun 24 23:32:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20597 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 F26DA4491EA for ; Thu, 25 Jun 2020 02:33:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D66976808CC; Thu, 25 Jun 2020 02:33:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8776068097A for ; Thu, 25 Jun 2020 02:33:03 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id q90so1460866pjh.3 for ; Wed, 24 Jun 2020 16:33:03 -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=u4kBKuAi180fGZzpRYP58VmiJnD/KjV+KiaoQ8V9FxY=; b=UFJaeyRmO3YyBxZqsoVbAyxoevtL9RsDgVLH8MWeMNaQorcSjKQJDuU5b6RNNohEuh L1iUW+NpIBTix+Jngt3BSHgOIsWOgq5QUUxq2HASdgwKI6dDkpj/0pQ0ipKv1UGLkbML CkMOSoaie4pYOYktWrv25eSzenZBkATjaaebGTbRFzFV7njfcWk7iL0mdfqQLzQrD6ro 9p14mgNHXdNEn8y4T99+LPKK2VosJJ5oBJLPNADtvItIYku2BqdbdGxV8YNy6XHucPDy EVf18BmluhG4Yi7bLMmUkSqEwfhTD+OjqmdmdQnRvnMH3r2ih1FW7ictd9YLvMR2V/Ef sjrg== 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=u4kBKuAi180fGZzpRYP58VmiJnD/KjV+KiaoQ8V9FxY=; b=i9t38JNT9QNhGNaJWxVWD8tgL6V98IYqNZxSgZ3XloH6uySH57pSHObaC0OAOjd4zC NZrBye+Nnuzu1MOzmY0O099xfMuteSkFWfb3fpS44FRjGUZoDqwl0/yQ84omnF2Uf+Ql MKAkFtpcIp4h7NmCedJHX1DFjQSD4hQ3ByK2KmtsL0jfduqFstqfeCDxO1red1d8c3ti 1xpLYnFnsoEzspOgiLtNl0uL0L9NBZkqbOx/FkVnAU+2OX7ouicF5b7z3MiFprHkVPeU XsP0FkO4N6RA6TlPdLNEINdP7doxXTmyV+7+T5/Cmw833j69ijGgQN4y+QIUsmo2NwEg 37vA== X-Gm-Message-State: AOAM531/aZ1P3Htmir2ib2AsbR1vvZt5eDvW3K7sD1YbHijq37NogJll DWqR3Tcl0AbiHtgzfX4YAriVXwpi X-Google-Smtp-Source: ABdhPJz28EJ05QYISj79stxBKcAqpoKd3ch6NIMO7M3kOGzCJJ4AHwk6pHs7M/kLUL8zNm0HOziQwg== X-Received: by 2002:a17:90a:d596:: with SMTP id v22mr229376pju.180.1593041581390; Wed, 24 Jun 2020 16:33:01 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.33.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:33:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:37 +0800 Message-Id: <1593041559-27350-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 4/6] avformat/hlsenc: use proper error codes 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/hlsenc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 71fa3db..f7a4f30 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -370,6 +370,7 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla int addchar_count; int found_count = 0; AVBPrint buf; + int ret; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); @@ -395,10 +396,10 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla } if (!av_bprint_is_complete(&buf)) { av_bprint_finalize(&buf, NULL); - return -1; + return AVERROR(ENOMEM); } - if (av_bprint_finalize(&buf, &new_filename) < 0 || !new_filename) - return -1; + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + return ret; *s = new_filename; return found_count; } @@ -411,6 +412,7 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla int nd, addchar_count; int found_count = 0; AVBPrint buf; + int ret; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); @@ -444,10 +446,10 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla } if (!av_bprint_is_complete(&buf)) { av_bprint_finalize(&buf, NULL); - return -1; + return AVERROR(ENOMEM); } - if (av_bprint_finalize(&buf, &new_filename) < 0 || !new_filename) - return -1; + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + return ret; *s = new_filename; return found_count; } From patchwork Wed Jun 24 23:32:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20598 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 D372B4491EA for ; Thu, 25 Jun 2020 02:33:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA076680A1D; Thu, 25 Jun 2020 02:33:12 +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 BEFA26809D1 for ; Thu, 25 Jun 2020 02:33:04 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id bh7so1836946plb.11 for ; Wed, 24 Jun 2020 16:33:04 -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=EgUxNK+uDN/7RQkMfJdq1lcMOtY+/M1REMDKm5J/TVY=; b=j5WhWeRavbmyhCZ7xMTcrzHuRyW+we197P2lKrpiU77aPSMI9MkxAO5wPq1GZ52h0u 3rbKFbU5/ihlOsbznUFsu15g4NWoS4R10SxgWblZ1jyqZIAgk0f0I/xNQubV8zPd3pv8 lI4miXW3ZsPTjO8hF31M3gOOI6Lkd9xdVUEkfu/4T+SSRIYxH4msK2u5cqJ0G3suxHk4 UsR4wFwX55BznnOQlOmTjPsJZpF0vMNrT/w4KvzgPa88Ij9n4FHIbawLWMkMro7wG4Qx J17BxsQ76SH7dseFK7/GZXC7W1viaybayKdNJ2f3Ctp4Qg+4a7S8Ze/OrRem1T00th72 a3sw== 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=EgUxNK+uDN/7RQkMfJdq1lcMOtY+/M1REMDKm5J/TVY=; b=qI3iyTc6SZ/cTkkgKILy1aXkJb3SFLcMUlqsjUPXp+PHtZesr/vFttAmEMYtxp5pWu /rB4aSD7eNtsbUwZULaa+wa5Ku3VGTWwF1gBIXVspx50bXArtyCJIKZHai1WalL3XBjY YaizR03/ygiRkSgQvhu6BKMQq2JnUYscyXzfw3LPfEDY6zacpanw3B+22L5k9KkmkfAl k9SBJl0FGbNjsiDty+B+X40YYjdNfQdcATOujWMgVXT/uz9nTPcnmsxoYdfEA1C+CdIQ U0LrcDDTntb7hI8y+B2n5t38Snljt9ayBiDybvikp5pZ5a4SVpCWVlwmKWansflQXZ+S gmow== X-Gm-Message-State: AOAM530wTQRMHAv/Xs+SutMPjFlE7Ha5jtFHsaxvjdBD18nHILg99/Aq Bp1lOwldZskQWFhgS1MECo/wTdi7 X-Google-Smtp-Source: ABdhPJx6MRvporW7BX9JXPZmx0FJN+sdvTncc+ng11c4BRagVOgkk1/GS1wIr/40eMAxB/I9Uhw9yg== X-Received: by 2002:a17:902:b48a:: with SMTP id y10mr28997122plr.97.1593041582914; Wed, 24 Jun 2020 16:33:02 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.33.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:33:02 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:38 +0800 Message-Id: <1593041559-27350-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 5/6] avformat/hlsenc: fix av_bprint_finalize() usage 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 Don't need to do double check by the description of the API. Reviewed-by: Nicolas George Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f7a4f30..a34da2f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -398,7 +398,7 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla av_bprint_finalize(&buf, NULL); return AVERROR(ENOMEM); } - if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0) return ret; *s = new_filename; return found_count; @@ -448,7 +448,7 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla av_bprint_finalize(&buf, NULL); return AVERROR(ENOMEM); } - if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0) return ret; *s = new_filename; return found_count; From patchwork Wed Jun 24 23:32:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20599 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 DB6BE4491EA for ; Thu, 25 Jun 2020 02:33:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C351F680A93; Thu, 25 Jun 2020 02:33:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 438F2680951 for ; Thu, 25 Jun 2020 02:33:06 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id p3so2297462pgh.3 for ; Wed, 24 Jun 2020 16:33:06 -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=ECedJ3G2Z8cZU6BbJA+1W66jpDiTQRBGDhy5xVcUCGI=; b=LUizD2mySkq2SFVN1Dq0doYRf6ZCWcJ0P8OXSd8evLzy89dM3+kfy0FH3+RTmGPRmk ltNHib0th7o2ruISpvwY5okpo2IA0Oioz4H9FaMBVqN5G+bBMcE19wKw2vioGpmKkkrk IXXvqSXeNcyda66174HDy8odn0T2Qx+hraTw7UfZMvuTSuh0lM20RLV/fo5GL3lVKQTn xb8EbJvk456gGSOXr+SDeD1G/HRI/lbIUaBhTJ+fSu7pXKmlSXOAyJNdF+3O5MkNQNqv xMkycaqaqtJdBc/palQ/RakE+C4s9qO3MY4rAjI2Wln8lrMKnqyJnB6XVBMLuH2t03m5 mpjQ== 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=ECedJ3G2Z8cZU6BbJA+1W66jpDiTQRBGDhy5xVcUCGI=; b=b4cgum8OPsuy3fQTEzf1FkBDTCwrcgVT/c5onNXvrXihnxV5azuIcXf0zXI7rYrTBA oGfC+iS9DX2DFiKglLVLYfaptUOn3Pq3z7d7+m/gSYtZ+GPXoOjnOAWV38m4D2SPenES cDgVHwTbYHaCFkra1scpjHwxAyC/7XR5keHSgjGVS9IyBd68oH7Yr1aBO1lIHs+C4dmX rNhvSKU2HsPgGOKfmMsrAZCfMYUPA8x+5JHvM5CjRuB35HmsfWSmC/BctMNkBJul22yt K21tgyDTrogpKVUsnhJvFGpqWqiS8ttkR3GOS5rhKFvVbYfc6b1woA+sHXFqXmdnR9CZ eGzg== X-Gm-Message-State: AOAM532p7Xe6su7DpO8nV/hKTetYlA406eZwlmqeNIWXf+YfS5ZvlZPV Dzcgq85vvr7cwipQfGTwellDWvWk X-Google-Smtp-Source: ABdhPJykzasN/8/IlVLR5uDAXRMaGycBsACnz4hlX0K8nso+njwWWuGvqotcBgNU2d9bjpzSqiT/9w== X-Received: by 2002:a62:58c4:: with SMTP id m187mr30106589pfb.216.1593041584454; Wed, 24 Jun 2020 16:33:04 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.33.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:33:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:39 +0800 Message-Id: <1593041559-27350-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 6/6] avformat/hlsenc: simplify code to pass s directly 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 Suggested-by: Nicolas George Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a34da2f..0a318d2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -365,7 +365,6 @@ fail: static int replace_str_data_in_filename(char **s, const char *filename, char placeholder, const char *datastring) { const char *p; - char *new_filename; char c; int addchar_count; int found_count = 0; @@ -398,16 +397,14 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla av_bprint_finalize(&buf, NULL); return AVERROR(ENOMEM); } - if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0) + if ((ret = av_bprint_finalize(&buf, s)) < 0) return ret; - *s = new_filename; return found_count; } static int replace_int_data_in_filename(char **s, const char *filename, char placeholder, int64_t number) { const char *p; - char *new_filename; char c; int nd, addchar_count; int found_count = 0; @@ -448,9 +445,8 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla av_bprint_finalize(&buf, NULL); return AVERROR(ENOMEM); } - if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0) + if ((ret = av_bprint_finalize(&buf, s)) < 0) return ret; - *s = new_filename; return found_count; }