From patchwork Fri Oct 21 23:22:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1109 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1266621vsd; Fri, 21 Oct 2016 16:22:31 -0700 (PDT) X-Received: by 10.194.18.137 with SMTP id w9mr2750245wjd.198.1477092151803; Fri, 21 Oct 2016 16:22:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 21si594155wmh.39.2016.10.21.16.22.31; Fri, 21 Oct 2016 16:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81C9D689C0A; Sat, 22 Oct 2016 02:22:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B06D1689BF4 for ; Sat, 22 Oct 2016 02:22:19 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id o81so786416wma.2 for ; Fri, 21 Oct 2016 16:22:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=pGxuUUO/MVXFINtZ/VjZjMXDbIr8LaXhMtGPF5x6lWk=; b=TG3olVChep2eaEn18MD7/azzGzDhqkXyemciV5Fu6eb8G55vvBTHCLG3oqhOD88GZW A1FzRhnHkmdFIkNHTyFsjsJF+EowhRjye0Nxt8PsYzxvWBBif2qqOR3OtxFdMSijGouP zm26acCRRi4aMXlpoQHEWNv61hj816oS21qnARdfVu+sB7wp3EyBeSFoIxoC0uXpefza k0CMD5E/JE0WIFdu3JcVbD+o+56a8ZNgzKZ+SUVyKIknbiC2UMd6DFMK1wxfEKQvQ6Zs 60X6DXZ9ZuXtglMB7h7o2zGTKdVqyswMULd6S4bXhCGkA7ocvLiV/QTNJRX4rtmZetGP iuDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=pGxuUUO/MVXFINtZ/VjZjMXDbIr8LaXhMtGPF5x6lWk=; b=UzNRtr7a385oj2IM0mN8dhoiJI71Uo35I65L409l7j4tk2Wy26SECQsCJlGCc1mJd/ nBnqF+ckkD1WIk+9+/67vbLC2t0eulZEmMDV7QxH4w45cCXbYQQdpd72swQmPvL/VgRW 4nFIyDd0stew6LDAnO9W9EYs/Wv5x3y0bwX90JvU9ZOhuMWhKe9s9jT1RCrdZ8VGXKaA +ONe0dEzZXcsUncyrkaKUsYmjjVNlAJKNWm2fGLGaKbA6rCtWYaYawPQMMBc3wPaanxZ YBTW+3FmAQuKgxWlKLrVLpIZZzawCRCjHkj5gWLZzNKN9FgP5jrPMYduARiGbWuNmL+D ja7w== X-Gm-Message-State: AA6/9RmWbvX+gb2g7ExZ2UY2V3lxxR812mZdXrCzwrGpiLxUs5ZOfgn3eVE3EU8On/Z/CA== X-Received: by 10.28.109.3 with SMTP id i3mr11843429wmc.121.1477092142419; Fri, 21 Oct 2016 16:22:22 -0700 (PDT) Received: from [192.168.2.21] (pD9E8E92D.dip0.t-ipconnect.de. [217.232.233.45]) by smtp.googlemail.com with ESMTPSA id l19sm700364wmg.5.2016.10.21.16.22.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Oct 2016 16:22:21 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <13a06398-32cb-c0ac-4135-cfd2321ce671@googlemail.com> Date: Sat, 22 Oct 2016 01:22:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] mpegts: handle AVMEDIA_TYPE_UNKNOWN correctly 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It is negative, so can't be used for left shifting. This fixes ubsan runtime error: shift exponent -1 is negative Signed-off-by: Andreas Cadhalpun --- libavformat/mpegts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 97a2225..cc2addc 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2353,7 +2353,8 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) int types = 0; for (i = 0; i < ts->stream->nb_streams; i++) { AVStream *st = ts->stream->streams[i]; - types |= 1<codecpar->codec_type; + if (st->codecpar->codec_type >= 0) + types |= 1<codecpar->codec_type; } if ((types & (1< 100000) { av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n");