From patchwork Fri Oct 21 13:00:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp758455pzb; Fri, 21 Oct 2022 06:01:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7E5D3VujtQ3kOlNOOxN/U1pj2ug7/VqsXdlip5C3q369stAGRcrFdLWIMvSjMycYNHSkcH X-Received: by 2002:a17:907:9625:b0:78d:bb06:9072 with SMTP id gb37-20020a170907962500b0078dbb069072mr15411776ejc.472.1666357273317; Fri, 21 Oct 2022 06:01:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666357273; cv=none; d=google.com; s=arc-20160816; b=VvWG+8P4RPeIOZlDcr+LeWDS52AFd4l4XMv6K1yuVdzaN56mcelv6SACEkupbbN8xV Nj74T1j2DzdQMKkUTlwjv4C8JDexwNYZWlB/JPdu0dicmWxTcdSxcOsenBMGFr8kxAcp PVMLgbzTdy+fCb3iKxKttLK/uYejrz3f1gBy4mSR5yeLT07kKPbSyUsT3EEgG/i3Dl20 ufQNlSArm4cMHcYFLc2kSfbXnZbhhKHBKewmLVmWH9Pud73mDsqL0puQE8TMc/AJMEDc KfvZBHYAQRXuMh8Q3MdCX+Tb44cz9MavZWAasrFMQscSY8iUROiTcoq7jTZPkaRcrQW7 vDpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vV03AmCYZEfJYRCJKWjmMBA6yKGWgrztl6QsK26O8Bc=; b=1BGRLY1ON1wCmSkUXT0bykR95UaJz1T+qDTfp5DwmjkBrF6egB511SZLASbdwkBREm 3XcY3wQoyX0fIBMlDY7qHFvAqRsdKDdoUzQe5Aba655GAN8UFCjJKVeV65Bvssz29VDn HOqi4NiuQm0JqQkcLdat1Q+JMDHCAHkf21DohBrvI1Ye2l26ePX9brJoEAt0PcwbwEss gDCwkiXMV248K/ywDjGvAAEWDQKv9S5HTRgh7z0Lde2khEiwzF9br/QH/FZiiRqFw9dg DHw04+pxgOkWfsC0vFCFg3fDfKJGfYDcfMow1Gw6MkJh9oZbKjPue7rW6kch8r1e4EXx ixbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="VSGmlr//"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ji4-20020a170907980400b0078e2f4c8851si17927218ejc.595.2022.10.21.06.01.10; Fri, 21 Oct 2022 06:01:13 -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=@gmail.com header.s=20210112 header.b="VSGmlr//"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DE2068BE76; Fri, 21 Oct 2022 16:01:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38EED68BE7F for ; Fri, 21 Oct 2022 16:01:00 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id w196so3092237oiw.8 for ; Fri, 21 Oct 2022 06:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0xvNOpqBV+Q6eyGxb2evw9iZpEY/ggnuNpZdEPOcUQc=; b=VSGmlr//sn4YU2hPSiexYIS8LcEGq1MxsLaHtm+8Boxm7K5PCqGWSLFLYU5zGEz7xe RWpWlQIMmoYrikR7Q61kheFI7To3nVnBg34uM40q21z92nZu+0GRjhTl4I5XkA+twc/F IuIKo76ZPvPqdaS13Zfni8LaquRFgG4KQNBTmPDL+5e0vQFlqaUylgPoE5svAkSaDPyk NAaPYfP6ZaVya84XsAOXoMTYhTFPBQDS808WjbdwVl6/0f24rjrqEqgiU2IDAT02xHgN u5OhXL+nesrsj4DGZgFfAluVPjlqO65yaARHBhISeu2CG9ojuCYavhsF+c+XmQpRSiu4 qSYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0xvNOpqBV+Q6eyGxb2evw9iZpEY/ggnuNpZdEPOcUQc=; b=5OPUqrXuQ+QAlm6sKgM1vLpZ+O6kiFa0+5+m4gnSQ3fxsqbPmO0nemf45NaV0nuKHf Vgc1QZmhYBPHKUL2hhoL9aIYnozvsoKPofyG0K2GktKQBDiJMKWY6trJnTXIE4C2ORPl jPcyqSOIygLNf3S7RnDLaXSKexZIpoSHzydxPIxxr5LF5+QLzckul+0eWYQlZOXp7Hli MDHYPBB4OEyUWY0Tys1La9E+TlDSY0p7UM/INcSt2lLrMEAqVCLxDkZ8oQy7VKUiNHED 4FldeXFBu3ExeGDAI7iP+bxrA3XcAlvtPQXGiZScVLa/I3h7v++UPFJEaxiJCnnaPEo3 dV+Q== X-Gm-Message-State: ACrzQf2ibME/G47SQc6hz7M+v3mzAA69TixLV5U2S/HN7Ut2Gznrizcy hDja6WFOzxLag7YgrqEdZ5otBivfwqk= X-Received: by 2002:a54:4899:0:b0:354:add8:52ab with SMTP id r25-20020a544899000000b00354add852abmr10629482oic.229.1666357257294; Fri, 21 Oct 2022 06:00:57 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id x15-20020a9d628f000000b0066193df8edasm1052778otk.34.2022.10.21.06.00.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 06:00:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 10:00:47 -0300 Message-Id: <20221021130047.1169-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/integer: ignore the upper bits of AVInteger in av_i2int() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: dJ5n6526jCVR The function is meant to return the least significant 64 bits after all. Should fix undefined behavior (left shift of negative values) as reported by ubsan. Signed-off-by: James Almer --- libavutil/integer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/integer.c b/libavutil/integer.c index b709c6d487..4ba33bcbc5 100644 --- a/libavutil/integer.c +++ b/libavutil/integer.c @@ -159,9 +159,9 @@ AVInteger av_int2i(int64_t a){ int64_t av_i2int(AVInteger a){ int i; - int64_t out=(int8_t)a.v[AV_INTEGER_SIZE-1]; + int64_t out = a.v[AV_INTEGER_SIZE - 5]; - for(i= AV_INTEGER_SIZE-2; i>=0; i--){ + for (i = AV_INTEGER_SIZE - 6; i >= 0; i--) { out = (out<<16) + a.v[i]; } return out;