From patchwork Sat Mar 21 03:50:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18313 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 E9EED44BC46 for ; Sat, 21 Mar 2020 05:50:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2AB368B7D6; Sat, 21 Mar 2020 05:50:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 451D868B7BC for ; Sat, 21 Mar 2020 05:50:27 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id s1so9823526wrv.5 for ; Fri, 20 Mar 2020 20:50:27 -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:mime-version :content-transfer-encoding; bh=pRsH9nlU6GLRH5p600QjuGbROfqfHgONVIdnN5bIiM8=; b=X6pDv20T2GEJZoCdgbpAmcwuZa113IGl/MWaFoyLkx9jKP9KRK+ViswQtaCdJKRIKH MI3S65TCGS9RG3SGHduESn5WyD2gmehnP7J7kL1FZL9otjtM6jkBK0/kZX1I+srxbsa1 tunDwx0mZiVIN+NV6aL5rSDJZGnMkBaw7pGpVXzl213iDvgayywgfq5lg+HbmBkPqnG1 uS/25ojJkMRWUMOzFjK4m3oId1OCbgnyEr3XnBHzTgrcHlHy57hceH42TU7tVmlV8VC+ uZ0tcsB7fA0zLumvIukaEnqXxjUQ8z2KJsYASp5QIjNFpemUKXTtSCrvFihIyDks4K9f kIvg== 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:mime-version :content-transfer-encoding; bh=pRsH9nlU6GLRH5p600QjuGbROfqfHgONVIdnN5bIiM8=; b=X9SSRj0+H9oAb3aWgUjggaF4Dt9O6OBLwKG5QYxOkOksO6Zr13s99hdT/tCYACzWaC Q0aI1P0gQE86KAsQEUDGIuv/PagGo2XWjZiFds7BWSn30v1wftNN8ppiLB6rFWFBlD1P nO3XVvqshKD093VOjIMXn9OeUrZ8coxS5JGCfH/UJ6K4HlGIM073hBL8H1nnKHTGFDDO jRTL4eRFKK4RigBykQvnEdO0/VMbBIPz0Qw4qWQvt5ZcOQN+PYDn9TckgpkWF2x38TVy a39EuGppIdzxCbMt0m2v5N7qRGnikkOIYwKhbpDcYDwZj3ymt0HWk5sMzSivWGLBx1rj murQ== X-Gm-Message-State: ANhLgQ3/IQ7jUmlDvu4ZFvvfuCB2F/mTBzGPntSELR/Es7NsbFPEiCmA GKpRftIfiEdmr9Wdht+3tSDIcRL/ X-Google-Smtp-Source: ADFU+vvQN/5SlvhtyrjjfVIuJS/LfVu9Jm8imImvp+Dy1FGKryhmUGNcewe+wn8mJ2MPCl5aEAwy+g== X-Received: by 2002:a5d:414f:: with SMTP id c15mr16215675wrq.60.1584762626531; Fri, 20 Mar 2020 20:50:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id b203sm10595616wmc.45.2020.03.20.20.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 20:50:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Mar 2020 04:50:20 +0100 Message-Id: <20200321035020.1483-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/subtitles: Don't increment packet counter prematurely 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" Do it only if the packet has been successfully allocated in av_new_packet() -- otherwise on error a completely uninitialized packet would be unreferenced later. Signed-off-by: Andreas Rheinhardt --- libavformat/subtitles.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 172da5de2b..ad7f68938e 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -132,9 +132,10 @@ AVPacket *ff_subtitles_queue_insert(FFDemuxSubtitlesQueue *q, if (!subs) return NULL; q->subs = subs; - sub = &subs[q->nb_subs++]; + sub = &subs[q->nb_subs]; if (av_new_packet(sub, len) < 0) return NULL; + q->nb_subs++; sub->flags |= AV_PKT_FLAG_KEY; sub->pts = sub->dts = 0; memcpy(sub->data, event, len);