From patchwork Tue Dec 17 10:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16856 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 A3F0944AB36 for ; Tue, 17 Dec 2019 12:30:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DC44689CFF; Tue, 17 Dec 2019 12:30:12 +0200 (EET) 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 09AA3687FBC for ; Tue, 17 Dec 2019 12:30:06 +0200 (EET) Received: by mail-pl1-f194.google.com with SMTP id g6so5896870plp.7 for ; Tue, 17 Dec 2019 02:30:05 -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=wnbuerPtz5BgqH6eTAa3zgqx4/eC8RaZIfmzunM72JY=; b=pD9XE9qPJKtsaUzJ4eJlX0RMk0g3cI8nDB9zECkEJVdjaouevw39fBX2ZotquHz0TN ywi0pE+0FQ8d2zvrEaD/OA7QYeU4RBROFuevn9qhwTZJ+dsgtGYXOMQNlTQz5UUGiYk4 JdbYk+s5Z5UsGJNjxqRpMQWCfzZuOs5V26Z6rKMU5BvFgREwsRm8FC4+URjjjkEi8bAj ex5Psh2eo3K8iZcYUuU9BCLZ6SJpJRamvmkqjFfLBaUH4bvpGuSHqja/sEy4UOQgBP7Y DozkGyfNrpECikwxKr96sC7t9CiAQ7h8uyvg5ZicO5Djmwq5nE3Fzx90O36fi8QEAjj7 y9mw== 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=wnbuerPtz5BgqH6eTAa3zgqx4/eC8RaZIfmzunM72JY=; b=UDl+hegyMhm+hBNrSTcjuctycd5FoM71aF23YcjAZA7C72vlTz52jsSA8NehgjkMqO 81y1AU1R/2K7wB3BPaqCQEUP8FzyVUr+vQyd3YsAb+ZCB751kRbd5XSK1DrcbTkzJp3/ dP6nnqYe8/2dW2wlEvotIt0rHk5bVdx30mS8axRa9B27lHTr4/NPivHpWS8LFNeKUVHq lPMIP1uEucnsLsSidWe51foN6Qn0zSBOIiuUJUFub3jIIpXYz6UtUEAEVDDkSG7efl0j IfDc54aG/bofM3gpnEDCT5Yvj9MF5K8J5fOpwNnVizecfwV+C7TRw6pPopRwhvBNlMJy WrDg== X-Gm-Message-State: APjAAAXsCehYuwpQxNJyd5F68I+kQ41xg+piADWgi/G6TVDZ+Tm1mfMP EvOuP/pbZspl/NuEwcaiKL1YOm8n X-Google-Smtp-Source: APXvYqxSUuO1Vbw1Qb2azn+CIAtF2sgpyldvOWzYpTCRa5kZ1znPgOaghVuUvVwOmEDturuuyYd2pA== X-Received: by 2002:a17:90a:b311:: with SMTP id d17mr1382182pjr.17.1576578150745; Tue, 17 Dec 2019 02:22:30 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j7sm29027254pgn.0.2019.12.17.02.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2019 02:22:30 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Dec 2019 18:22:16 +0800 Message-Id: <20191217102217.4811-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191217102217.4811-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index d4eb9c0dab..46fe8692dd 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -250,14 +250,15 @@ static int decode_unregistered_user_data(H264SEIUnregistered *h, GetBitContext * if (size < 16 || size >= INT_MAX - 16) return AVERROR_INVALIDDATA; - user_data = av_malloc(16 + size + 1); + user_data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); 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; + memset(user_data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + e = sscanf(user_data + 16, "x264 - core %d", &build); if (e == 1 && build > 0) h->x264_build = build;