From patchwork Mon Jun 15 00:01:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20378 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 827A3448DD8 for ; Mon, 15 Jun 2020 03:02:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D90168B66F; Mon, 15 Jun 2020 03:02:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B3DA68B436 for ; Mon, 15 Jun 2020 03:02:22 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id c71so12876618wmd.5 for ; Sun, 14 Jun 2020 17:02:22 -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 :mime-version:content-transfer-encoding; bh=ykd9nFw5RUaClGqbTg2Pgw1xw4q8oDvkbF0piTokE+E=; b=mSz06sVWDiR7uG3d5VL4k45Pvt2X4iQwApda1LDyJG8BrIrkOyUcZTsHb6atV217qR OfV6aUsycRdKFbLeuqp+ZJqVpsazEx0N7St1gJHiwU+a+9HCBiGPAybSvr6dHTk7MmU2 lIaB/ta7NwmE4GeeryXltuGh64+DEBcjsUsnbx8F0MbiB33pH6qTGABzqYGUmipq3pp4 aiyqntrE8e+yxo58y/Xy3fEmOOFKY5IbG91yFCXOSeRdXWZ997fs5m7F2Dkkc+Pak5JD C0mZY82H0Pplq7PCwrnrcce1FPlLV3fsPyzaV+AhcxL1OdAAkNFKNNgyX85pU8eduXwj i/OQ== 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:mime-version:content-transfer-encoding; bh=ykd9nFw5RUaClGqbTg2Pgw1xw4q8oDvkbF0piTokE+E=; b=c5WSdWv/lGBH5Emp6P2+4HxjSu/RoYwYFLzPk/Ltx5bBDW0Pf8ydLUlR2Y+POvYcko QNJ4iuRMUiSSwD+3FYsnK4Y0b8hcozKOIPv/vVBpy4ixq5huzVl8/u3o3t8d62TVTKXd Q1onqLi0wAnl4GIP5+MrY9fjhJGhv1t3cgQ+8J28E3UmqQTcBeYHc67RMs1gHCNlNvT3 y/Tl9S4bF3bVGnqLPY9Edut0XSDRBuZJu2OGdh+e8ZEDfzArTdnqGzzyr2QLDuHv6veH lyFyYRcOO1ICCyM/uh5zJ438FE51+gpVvp5QNlLF8QqBjl0kVS9JaB5JecqdfzwlVP1Z r1Ow== X-Gm-Message-State: AOAM531fhUwj0X0vjh84eE0HVrtKBJcucyUNIMVdmhyKth96JBRJK93P NKv47raxR/EYjKfGjGeqNwZH5Z89 X-Google-Smtp-Source: ABdhPJyuHi72xEX+vHT2mPSQ7Z6hZ4OQOuV0p3MvqomsB9DZktVS+UdEW2+x3sqAK123G4F5zPauYg== X-Received: by 2002:a05:600c:2110:: with SMTP id u16mr10042002wml.26.1592179341355; Sun, 14 Jun 2020 17:02:21 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id 5sm29512167wrr.5.2020.06.14.17.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:02:20 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 02:01:56 +0200 Message-Id: <20200615000204.10568-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> References: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/35] avformat/mov: Check earlier whether reel_name string is empty 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- This patch and all the following patches are not intended to be backported to 4.3. libavformat/mov.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 4e68532b69..b2f2f8a3dd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2342,18 +2342,15 @@ FF_ENABLE_DEPRECATION_WARNINGS uint32_t format = AV_RB32(st->codecpar->extradata + 22); if (format == AV_RB32("name") && (int64_t)size >= (int64_t)len + 18) { uint16_t str_size = AV_RB16(st->codecpar->extradata + 26); /* string length */ - if (str_size > 0 && size >= (int)str_size + 30) { + if (str_size > 0 && size >= (int)str_size + 30 && + st->codecpar->extradata[30] /* Don't add empty string */) { char *reel_name = av_malloc(str_size + 1); if (!reel_name) return AVERROR(ENOMEM); memcpy(reel_name, st->codecpar->extradata + 30, str_size); reel_name[str_size] = 0; /* Add null terminator */ - /* don't add reel_name if emtpy string */ - if (*reel_name == 0) { - av_free(reel_name); - } else { - av_dict_set(&st->metadata, "reel_name", reel_name, AV_DICT_DONT_STRDUP_VAL); - } + av_dict_set(&st->metadata, "reel_name", reel_name, + AV_DICT_DONT_STRDUP_VAL); } } }