From patchwork Mon Jun 22 15:24:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20557 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 9C1E744BD1A for ; Mon, 22 Jun 2020 18:32:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8710F68B90A; Mon, 22 Jun 2020 18:32:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0B1468B8FE for ; Mon, 22 Jun 2020 18:32:02 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id u14so2235pjj.2 for ; Mon, 22 Jun 2020 08:32: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; bh=s9SH0bSve2b+wbv4baONnUem4dbJYlxon+SLOK9IgWA=; b=pYMqkBKyo9wCFwe1mf+9T+QEUBJt+S8o0tJR6H7/mhUuBb0oZ3GpJhB7oT5YICgP9l Fgc7VlYHNJ9T6skONbqk2zNuaaeZ2vR8KfVWYliiupSfkVJsopq3feipXoP1Kl4N42+c /2PWkw46O94SnIAzANG488ZDhzMbZOjIt+Y22DEiFYK7cAGvPAnSqloTzl58pinjCMJ3 SPnzXH8tSQOEcJWRp2gSjJpvugcDkxZsMzwOTa9VB5Uw6NucliyrQpf+hIFmz/uJcK1e iQ8oEEA/kq1w99hHBQRTNURVInGZC0Mrj2ZrMRiW2kdbYJeilx9iaCyQGMY4NglzN/N6 mniA== 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=s9SH0bSve2b+wbv4baONnUem4dbJYlxon+SLOK9IgWA=; b=KuxwN5Xm9Wy5COf+lM2V12wpYs7SW5bHtQ/vEnARnKpmS5tGyzN+L52S718zrpC25k +h/kijlyU0JiAvK3LZl8xQQMua3/wI/Scx9EMtTr5CS5P93r1EqDiwMGHXtVGOR3FLrQ WOyz3k1VR94krEwuWHrSHHieYE4eEWDzb4nzFnszyPnGLSsX+hgSbYHHjAN4Jvl+gtGQ KBu4/m72Xb3J4jb4Wmz0DpRWBZLVEDzgg0uxP3utWd541TcgiS4ElzYvNBNpQsk21NwJ 0910R8wPxlsQlVpkz7hsnqAlKG2EMPdfVwXIvPKjUQPDFPh2EJmR3JM8znJYdnKx2dHF Di2w== X-Gm-Message-State: AOAM5327qHdkX8pHWK61Do0cXOKVl1f9QQKXjzh3nUeNWkjxOUjdIcdG Ikzc6jcB79eEGGQ/kNgyIE3duM8q X-Google-Smtp-Source: ABdhPJzqyI/H0RrHl0X8PMyJh8ZlJOgsK+A0GyOf4bMuNx6q2fsu+qnAVtH//6byPT5w0OvdVhOxgQ== X-Received: by 2002:a62:18d0:: with SMTP id 199mr21389738pfy.101.1592839483696; Mon, 22 Jun 2020 08:24:43 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:42 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:29 +0800 Message-Id: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 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 Signed-off-by: Limin Wang --- libavutil/opt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 2c3f998..552985e 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -2120,6 +2120,9 @@ 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 Mon Jun 22 15:24:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20553 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 E9D7044B609 for ; Mon, 22 Jun 2020 18:24:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C418A68B861; Mon, 22 Jun 2020 18:24:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3ACB68B643 for ; Mon, 22 Jun 2020 18:24:50 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id b16so8534705pfi.13 for ; Mon, 22 Jun 2020 08:24:50 -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=sZgv++jLenq4e0yF4DWTHi/IBEf2MFxOUcEP65Cm/EI=; b=KnBUi/1nmDgtENXPlk9uLO6hCkvGnhhGRJDcuRtVv65+o1Sd5gM9koe6vO8tLQAtCZ 6Diui/JylsqoI6+jr4cpBCyvVtAt9k6SRSHce+t+zCR4qBVz5iUTXHOcorBgxuBqq5xq 4Y2CL/x0+pN1k7I/U9EVcqtCX/n8hlQvsDhmw/Q3se45lR6RQMywk9fNQkNHCrZs4VvP qfsAmAinXZkYON5cZAOlp1sjG53BDvaj8Kn6wJ8ATLRP6vbufM9UMCIV2d3Eo3Skdr/8 JQhN9y3S16gwcJu/ZMXSNYqr1QJ2GQqflrL12QFKClHaY4BA0xhIX0VTDI7ObxgxOz2d geeQ== 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=sZgv++jLenq4e0yF4DWTHi/IBEf2MFxOUcEP65Cm/EI=; b=B5sFLT6InsyGmaAA+9R4aWbLFZsszfVYQhYBtKtKI6rIFAZQewoo60i6Bm6usx2OrX WP8eIMy9OVIk0iQf2C7OwZp7iMNoyAqNLUcjMffa9PJgDcPTkqYm6HD+4Zhqbo/jonVI lsfZi6usMQ4NlxkFA6VGiQZrq7PNhYhMR3dhObHtsNlqFNiRe52DTCIZhUIuegwUUBAD GesjbZsDDWtMyiboPi5lJm+TCLIfv+HfkYTES5qeJUAKUghzkwnk2yZhS9Q7/D6J13oi A2AuORpsvQ2cqNME/Lc/Rjwn2HWOV0kqdW+qUviE12IEdQjfAw6hHFCvYr5iJ+5H16jN 4XQA== X-Gm-Message-State: AOAM531PrXLBg48D0fqA9y56G3+sKDEqYRagTrN4HHpViXeacHoAUeus 5Yh4vx0QhhAhjTQSmYb8WtIvyYZW X-Google-Smtp-Source: ABdhPJz/Vk0EJilWhuX7e0XIhRzPtQNxTFsVaSlo1YsDBzkmCoFQXo3l8Vljj3bfOW5nOKgzwtjRuA== X-Received: by 2002:a63:a119:: with SMTP id b25mr12956648pgf.10.1592839488651; Mon, 22 Jun 2020 08:24:48 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:48 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:30 +0800 Message-Id: <1592839474-2804-2-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 2/6] avformat/ftp: 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 Signed-off-by: Limin Wang --- libavformat/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index caeea42..39ea297 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -200,7 +200,7 @@ static int ftp_status(FTPContext *s, char **line, const int response_codes[]) } if (line) - av_bprint_finalize(&line_buffer, line); + result = av_bprint_finalize(&line_buffer, line); return result; } From patchwork Mon Jun 22 15:24:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20559 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2874939ybm; Mon, 22 Jun 2020 08:30:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPh3YH+MugABge6KL7wlkkdXpxwz7HTzS9YRPzfl8Mg05L9IalbTQ+r4nAQOH9LUKwWora X-Received: by 2002:a1c:9d09:: with SMTP id g9mr18543174wme.31.1592839808736; Mon, 22 Jun 2020 08:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592839808; cv=none; d=google.com; s=arc-20160816; b=TVuQsZn5a5hHYdXKJB1wnS2UTnHUT7PCXdG2ywVUltPmfjXUa7u+zonYCJPDaiTjuD FlMKkN18C12xUqHR9/nU6R1zAUNa8oS62reIb2l/0wtrlwxpysQcdN8IRyT+qXMQmmhM SD3inOfrDiUtm2Uii89TI7wS4JkgKV6VdcsAF2aHDcbpRhglXibtMW/oBFnsGimY4mrZ Qc2sH2VAlxErLY2OtHZbNpGXBt8tsAnIPYngAGCqhdbt4W20LosZ3gxuqI6NL8orPMdt r6KQs29MUzrWSsBdN9vCD2Ba5HvhbzPyqTy5Lgyp37Ij8HjZ75nPnP9LSmuEwyI7ARol Huog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=EbRecUSOre1CyUpFggwKksvwPeGt2EjwY2z8hR1N8Y4=; b=UVIyXd2RCTgEhnfgWdiLDfnncjXfMFdZhX3PxsAomiT/YJfhqmV4EsaYOCy4X7LWQI geFWE8tBWjahRa4EqZjbo4TFMX+AhCr9Sk7B05BYzXjF98Q7KM3ZZS9rHAogP9V1WL1Z 5kCBatH1utookwV/SCeKWoXg3IZuTPuj66dn73TDvtSt0G85R4TPSU8l9OWVQOGT1ZUp Kz9EFyOlYjamvKlBlGkkRQ8oGHupfTK1pPRTWcQjLdMsqXZXXaVIYKkylPV6Yl4EErjM gQIcFPn7TTBDaETgM3FskHSAW/b3qEpxQibwyQQRrsDJ2WvJnR4wXHoa1HyZzsbfH364 Shug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tLBdbuMJ; 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 h17si15257937wrv.49.2020.06.22.08.30.07; Mon, 22 Jun 2020 08:30:08 -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=20161025 header.b=tLBdbuMJ; 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 D390D68B90D; Mon, 22 Jun 2020 18:30:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAB5B68B5FF for ; Mon, 22 Jun 2020 18:30:01 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id jz3so4089pjb.0 for ; Mon, 22 Jun 2020 08:30: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=eTEYBnqxclJgSPfkTklY26vy3ZWaAkHal22+q1wOerQ=; b=tLBdbuMJMZkWUh8BwTlZ7Iv7AYGj5qxa8GHt8hdn1Lqc45208A+njt3bwh53B7kF54 GwAu1Folubk5DWVZntZPJWcNYnJu2iadwNGiegtdQRONt4kWW6R9fGo/vFWmOqdJGIii 7ZTnAgSB23QLahWrK6wYYue9ZzELZbtJnowDFpKO7l5kPCccx+vNwRDMBRkQ3//2eQQs MOg32cHv7fqHcWXCpO252QgNZP18Ei7E4hW96mdkT/+adN/8ZcGOni5T1wjzaaCJS2E8 1dtTXsm5qij2sgiiaoOv2qB/76HjoDJeGn7Ir7rluxDVg6eRIXpM0QJw/tcxIyncAPmS wd+g== 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=eTEYBnqxclJgSPfkTklY26vy3ZWaAkHal22+q1wOerQ=; b=P2Hh9RHasvg2E0Y6y4B7ytYnXk84t0n6aeLicnZXJDTQ57QPsH+dwrL5+IyrTWi+ls 2z8urpvAqxqVfTiapzXFAqD7vVYeJAlWJ3OfsHkpju6B7BaB7yWTP/C5C5WXXTzubmuH jj3PeAaZj1f9I2IzIqhPydrNj+ZF4lJVqAZ3KX21HX6XWee6zGmaMUBkzuf37cc0GdPW kHIESJPZxSJDbsXP+pY2HbY4Ln8xKPr77C8DisqDIQKnPKTW6D3cnvawsH5L9aot/uS3 zlSEmRC67FlCiQ6QjK9eNzxyHXVhfI38TCR0kkO6SL9EWSMOaBG2HzmmzTji8EEqFcPt yhwA== X-Gm-Message-State: AOAM533jiORepOsNn+PBWdquRaGF3ekoq9CCnjvhroTrxJbIrVVu+TsT 9VaAlmCQPU0jIM61OnyGb3qXo6bo X-Received: by 2002:aa7:84cc:: with SMTP id x12mr20422295pfn.235.1592839491777; Mon, 22 Jun 2020 08:24:51 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:51 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:31 +0800 Message-Id: <1592839474-2804-3-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 3/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" X-TUID: 22ZVcaHjcVVG Content-Length: 1755 From: Limin Wang 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 Mon Jun 22 15:24:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20556 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 58BF244BD02 for ; Mon, 22 Jun 2020 18:30:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E79B68B904; Mon, 22 Jun 2020 18:30:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2C5168B8F5 for ; Mon, 22 Jun 2020 18:30:32 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id d67so15950242oig.6 for ; Mon, 22 Jun 2020 08:30:32 -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=sW9BKdoGJ3USKlVUQqM3I7Iao+iinkI7uBSbaNYalbA=; b=q5rT2y5Rsvg1ZZ+yQzm2VJnUPhwO1ZK26jjOUL+TkwDG75Ad8sR6jvI/15pURA9Doh xb/RVJm/V3WESrF2tlkJ1Ge2VhQSYbSzI1ocXEqDe6srbASs7O6AgqDkSUJ+uKwOY5Aw sSwqfL/SgwTq9dzQytKsnVzs+DaQ/w3/0cnsvDZGnuGtfuB7RofqD64/+EYYIZz1buNv GldXSSur9cp7Jms20MS0EUhWvtt2nvM1mv0XmISZTR8eSk4j9K7lWWvpkQkbhQLSlwTb hWK+nqSfaS0psRYB50atAAkU5qHe0UxzcBCoomhHbueyzFNsmBjglVWwuJ59LLHQ9xa5 /cbA== 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=sW9BKdoGJ3USKlVUQqM3I7Iao+iinkI7uBSbaNYalbA=; b=V+YpQGBjuuHoEYYrgndWs+AtTCxBMUaTP3EqLsYObhsZzF30hdL5YeqKhOBR6zQPtZ xS+ToWVfnQjYbVGsN3G9heR6ueFZcvXyDtChMiMspn1AXJrpPVWDSpTQrjEbmd7upK7u jqMGId8X9KSZYKkCdX54iSiFG1r4KmcCtRnnqE0cDpYq5GdURHflStxPaKDL2OmyIUcx 9LIeVIDLltjvmrcs7Te2wjaGXmHxtbugxXDdWgcUUCqfM+GfzPlCAbHtyNrkhyt7Z76a oPPiQKyEyBlJ1+KAZ6LXe6o2YCk1CCfv4TqDJvoD9h5dwqd6xGsm3QsCBNd0/xUhQ9hC gkaQ== X-Gm-Message-State: AOAM533iKueT9oex1+n2N9bNLTwWFLB+I0ePovleyYNlT10GVMW13Qsa D7ZaAQruMG1KW1EyLBM9pUUf2qTq X-Google-Smtp-Source: ABdhPJwbcsLzf28bAkI6NTxQDxovKq4Yucer0cwb9fwN16eiEHQzTWDtitjxleYr0LJ5mtCYjlB9CA== X-Received: by 2002:a17:90b:e89:: with SMTP id fv9mr18644642pjb.131.1592839494485; Mon, 22 Jun 2020 08:24:54 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:32 +0800 Message-Id: <1592839474-2804-4-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 4/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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/au.c b/libavformat/au.c index ff9176a..b6df63e 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,8 @@ static int au_read_header(AVFormatContext *s) if (size > 24) { /* parse annotation field to get metadata */ - au_read_annotation(s, size - 24); + if (ret = au_read_annotation(s, size - 24) < 0) + return ret; } codec = ff_codec_get_id(codec_au_tags, id); From patchwork Mon Jun 22 15:24:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20558 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 0DC8244B609 for ; Mon, 22 Jun 2020 18:47:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1EB668B8BA; Mon, 22 Jun 2020 18:47:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E036F68B672 for ; Mon, 22 Jun 2020 18:47:15 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id p70so15983299oic.12 for ; Mon, 22 Jun 2020 08:47:15 -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=GqI4+yfPvEFnPquaBz9ytF7cEO7dWtUvbWa1P15Se39/3StCg0jRMxgOm/ElHVpHw7 h2zUhZ1ADkOUurYKHsZojVNK3+W2T69ZUjTrDk7WeIayp9tRR8g21RK+l+bMdlczzqui hn0r3gsknB/BYUe08znkmQpRj3zwu1j+CubepPl/lyPMU9p/dkkUHO+upTv6lZveqHm/ jcLLIPejsGc3oZ0yswYrHJIkzChBszMUnLF8rDWxYJHxfR+E4iTYzE+NlmKR/rHUX+xc wY7xMQtB7rRPQgwNoNx6OSDamWg5Ca0yyKzoaUqIohxWf+X/JLz/iel9o2issI3eqMBv kj0Q== 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=qLOY1XO0+kUHGQeUbnOqZnU9TOBu7vohiotlbbi8MbL4bJ2hQ4vMwwjyKslmEUxb31 8CjuiWoJ2l966ncPjTbr7IM1/x/nN7ARAejuuhoqu1ibeij9RQPTABYc3MQtJT+QCGG9 1eYgGvdbvbaa4AaLnOjy7NiNKcjbfK8jFRm92+V2nn595nAMyqHIrg0IAeqGc6hRLYLJ MzNddNbhnTIs7L0RaFDqpLWiBdHoc7GN/ry6YxygJTPrFLH3T/JxVnOEPwulIjWxlj9A 4kXyHPgb0LyvqZIT013l/vIpkwc9lS+VtgqnrpLpaDcYPi8gbAoR7YxYySdgQm+iXocZ a8Ng== X-Gm-Message-State: AOAM533giDat30DmGlk/g4OBTw6SLIYZXw6c0+o8LyHO/Vpg5wKUYZTG 7tksmmZAb0MiSz/ESwtC14FHX597 X-Google-Smtp-Source: ABdhPJxXFbTKlOaHTc3RT5qLbO2Aclm5YF8QmpUJBAY7WU3KPBqLf3GMyQY9r4HSfcWeZGs++qx9qw== X-Received: by 2002:a17:90a:d188:: with SMTP id fu8mr17689772pjb.149.1592839496856; Mon, 22 Jun 2020 08:24:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:56 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:33 +0800 Message-Id: <1592839474-2804-5-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 5/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 Mon Jun 22 15:24: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: 20554 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 036DE44B9CF for ; Mon, 22 Jun 2020 18:25:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E544568B8F1; Mon, 22 Jun 2020 18:25: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 2CF6268B8F5 for ; Mon, 22 Jun 2020 18:25:01 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id q22so5435637pgk.2 for ; Mon, 22 Jun 2020 08:25: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=6Ja0lwAiRFC4dgTKEIYSEqQUsc9cQh8qg8ui4SohS3M=; b=AaIvzoWCsBHhbcd4TP5ET6+mwRkECszdA7KPoFCLDdciXHvvDbh2SMkjkcERtEp5z7 aLR7rlJleSwXqS091fIx2LWM9AqVv3Smgry3tvjvfqg1wuYlilvIiHqNA1IAkaOGdtFI 8UMOsPWgDoao25KjkMUK2ZNAXSlqytQNozcnkQVlX82TL2h5m/SbfwpIEoRozLIKIGEN xHvI2KsgXAzX5dbE13CtbFVzF81YOQab9mYVeJP4Bxxz1Hc8H0MhYZc62Hd2L8jowIKX xKL+fTA7R7K1cVBy4YLz7EMMeV/fX5anEzhBQ8WnwzndYiPoyGBsF1qiC+KUIEHaFz+C cLFg== 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=6Ja0lwAiRFC4dgTKEIYSEqQUsc9cQh8qg8ui4SohS3M=; b=coU5ICWZovenHxXc6f9xZvZIlpjsp3V5Amrq/chSy+gwuhLYOXzyNOtRKiLfgHxUvc GNmrnQvEwFZVHhGd0Ba/yE3yPIKyvaEtEiJTDKClNDQ4pMeIF8ZBR56X5BbkdyNGTJBB HUnwObt435Pqj31/Q2Me26A9O6mJHWY9pHidBDcTkHIIlpIV27iY0cn6xmQsb4ldUwFR vnfFCBnU2/13Adc/ZDMlgATzFEOAjfk2keGyHB1090ahEkSKd2IHujaMPwDxHvhTRKsm j81Yz7L+IBg7saybqbuu/Xub7ez0LWdDDXVK/Wyx6+hepGDkTCFkEbIwJ0mEY0efI6yJ fydQ== X-Gm-Message-State: AOAM532bh/y5YpFHsCUZqPEvafMdLpiR+uN2RwuL0qZEew6pH9C7d4RC /h7YOL4nF87fddYW13IdXolol9Iq X-Google-Smtp-Source: ABdhPJyrRr2aXKOlHZ+E15rhLOwfafrtdOETOOKyyZW2fzTIYLaeXel4eCODWmAs6AGqaYKWMm07LA== X-Received: by 2002:a63:1312:: with SMTP id i18mr13470814pgl.142.1592839499507; Mon, 22 Jun 2020 08:24:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:59 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:34 +0800 Message-Id: <1592839474-2804-6-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 6/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. 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;