From patchwork Thu Dec 19 05:09:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16881 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 DCA904485BC for ; Thu, 19 Dec 2019 07:09:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9BB668A633; Thu, 19 Dec 2019 07:09:35 +0200 (EET) 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 B52AD68A628 for ; Thu, 19 Dec 2019 07:09:28 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id b9so2451421pgk.12 for ; Wed, 18 Dec 2019 21:09:28 -0800 (PST) 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=EHHuGHxBuBwnrg86Aazu/zTLFhxbbbUEw6a2hpxhOgU=; b=rXVV9zpUa9XcchQn3xGdW3s1/tLCpF3stJe/ZUzYVkCCQpDGkNMybJ3gx4pCCana7G X+LMdjT/xsMP5pdW6yTh52GlKYpBKs8rpQKf+/5Lr8SvuQEwp8DRcNaL7Gg9vVnjdbBG mMf8+vRFJddjxYcqKZVdNgwujWhCzDD5AQU78OfVNz+djP2ZEa1Dyl/0F2t5iL4LIcPg c7Dj6ioPQcWRdqYxnXdlTrsZrEDkJWkXcFRa/T99uybQJoebBbVBVbaEfKp/t5aci/kj BNq8YBlucG8mw+8nIMFW5+ZorNkVtvUq7S+ca0WnvPq8cMe8wFSIquhpdjCiyWjbwUjM h4/A== 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=EHHuGHxBuBwnrg86Aazu/zTLFhxbbbUEw6a2hpxhOgU=; b=TIBFNEGeGEOR0Jj17iEUgS0po7UNmDSEpZ1Ykd1padQq1Y9oJbvrJ53a7moNBSwKqD GIUtjmAXwQgPZPD6jHsFUBiviwf/TLIzWsNwHf5+Sh7ZLySq5SDuawz1RCRddlAdNtSK c+9wW9JtgjkrgwgTpnE1Cbuwp6KXVpRDPLdBaRQD9O/z3PZB1UFNlM9WeAPGUdTTn4NW GAAtDpcIIAM6SurXZWGusXXCtlBFH+LXmHjqz5SaeBzKdVwC0Z/AdKWRRJNH/S20mGc5 Syax2CEx5BVYL4Rw6GTsOzqAlAGKzUMMQkqp0zHWkMC0y2qiCwh25G1wxju5SnIFN78L rfUg== X-Gm-Message-State: APjAAAUU/wdpnC+ijbtArM9VgJX7HfRkV9em1CD61vdb8F73vcV30VB+ gezUlmXl2RW9iqveqctgJVHY2CGN X-Google-Smtp-Source: APXvYqwL8jlq+AtDsIYwT82nPN+7gyCBy0AWzL65J5iUhMnsvAdOM6iCI2W6tm1uRLok1yl/6mDYsg== X-Received: by 2002:a62:1c95:: with SMTP id c143mr7240069pfc.219.1576732166852; Wed, 18 Dec 2019 21:09:26 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u6sm4925897pjv.31.2019.12.18.21.09.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 21:09:26 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Dec 2019 13:09:06 +0800 Message-Id: <20191219050907.15041-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191219050907.15041-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20191219050907.15041-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 4/5] avcodec/h264_sei: fix the size of user data unregistered 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 According to the specifications, the payloadSize includes the 16-byte size of UUID. Signed-off-by: Limin Wang --- libavcodec/h264_sei.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index d4eb9c0dab..a565feabe2 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -247,14 +247,14 @@ static int decode_unregistered_user_data(H264SEIUnregistered *h, GetBitContext * uint8_t *user_data; int e, build, i; - if (size < 16 || size >= INT_MAX - 16) + if (size < 16 || size >= INT_MAX - 1) return AVERROR_INVALIDDATA; - user_data = av_malloc(16 + size + 1); + user_data = av_malloc(size + 1); if (!user_data) return AVERROR(ENOMEM); - for (i = 0; i < size + 16; i++) + for (i = 0; i < size; i++) user_data[i] = get_bits(gb, 8); user_data[i] = 0;