From patchwork Wed Feb 17 10:13:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25690 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 D5FD1449181 for ; Wed, 17 Feb 2021 12:14:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDEB168A646; Wed, 17 Feb 2021 12:14:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD02F68A545 for ; Wed, 17 Feb 2021 12:14:27 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id v14so16743130wro.7 for ; Wed, 17 Feb 2021 02:14:27 -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:reply-to :mime-version:content-transfer-encoding; bh=QA8P+k2bd9l15HoQBPL1FJfxu1pPx5kMNIgS3w5/qds=; b=qjNbRqU+aVOVwBLKTxNWK1cnm4AEYQs6hFeitN8F3/1IhUpcg5/JQ4APHFn6VHsBs7 vBaAr/oOANy9Y8wphHxxlCkKrDrGXVrWWuckJ3JPq8v4452vPnU+/W7FCLM969RiEPfC wi7Nx8oSMrRIiYNBOuDqpg2jT/Rs9TOlEGvVJChbu1z1TsHTlC/J5oGaff/+bcj3loWv kTvsA6OpBOZ0D+bxwIloEjalAPiy16M45U5+lzWufJEacvTltD19I7Ti26sVs/42K3o3 UHdqCkeorhy91xPRcVO+yR1KAR4fc2pk+0+GkOZ8twCbjz5WbVM8nZpjCM0eE2Yz0SQF Zghw== 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:reply-to:mime-version:content-transfer-encoding; bh=QA8P+k2bd9l15HoQBPL1FJfxu1pPx5kMNIgS3w5/qds=; b=g2CUTw/YaO/IEGR7cf+u0cTQpa3+VN7t+s54OejLnEulFpC26CzRamFTcUn3cADGn7 tDkXuGoJRgFnrK4QsPfW4UXhrJcyalE06C6bb7MdnC8eS4P8gztMJUz5lQro6ybn9EEp /xiUaidgTqtx5LRQAGh7Q3aAyfMsbDIZee0qiwXyQVEMzfII02O6gcGrDUXyHm/7ntmk 3A+aXzonRo/prZTaCpfwHLjtBZrq5rxuxr9o4xX1T83v7aaF6FB+okZ0zPc45+RD8teQ 3mBhkhLKd/YkPr6VWT/17DqMfKxc3j+LW4e9/O+lhBiYASpTDM7kCg7xqwbOcdUD9Drl QhnA== X-Gm-Message-State: AOAM530QRUfy9W7EYnXqxC58WAMObe+JAgEFBpzcZJh/rzUSBnc62ved KobhjiAgMJOi8DI7Y2lfzeqJzCvMG0Q= X-Google-Smtp-Source: ABdhPJwQNFPGPqlosNZKS8AR6aB7H8NZCz1WDWk1dN1Is6z/nS/CH8OAHsd6GggZtQNj3Nsj812RWQ== X-Received: by 2002:adf:9c8a:: with SMTP id d10mr21295116wre.266.1613556867015; Wed, 17 Feb 2021 02:14:27 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v12sm3502828wrv.69.2021.02.17.02.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:26 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:44 +0100 Message-Id: <20210217101356.1723370-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/19] avformat/matroskadec: Reindent after the previous commit 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 --- libavformat/matroskadec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index bfc6641a5f..636ed23f0d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1006,15 +1006,15 @@ static int ebml_read_ascii(AVIOContext *pb, int size, if (!res) return AVERROR(ENOMEM); } else { - /* EBML strings are usually not 0-terminated, so we allocate one - * byte more, read the string and NULL-terminate it ourselves. */ - if (!(res = av_malloc(size + 1))) - return AVERROR(ENOMEM); - if ((ret = avio_read(pb, (uint8_t *) res, size)) != size) { - av_free(res); - return ret < 0 ? ret : NEEDS_CHECKING; - } - (res)[size] = '\0'; + /* EBML strings are usually not 0-terminated, so we allocate one + * byte more, read the string and NULL-terminate it ourselves. */ + if (!(res = av_malloc(size + 1))) + return AVERROR(ENOMEM); + if ((ret = avio_read(pb, (uint8_t *) res, size)) != size) { + av_free(res); + return ret < 0 ? ret : NEEDS_CHECKING; + } + (res)[size] = '\0'; } av_free(*str); *str = res;