From patchwork Sat Mar 10 20:51:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7895 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp20811jad; Sat, 10 Mar 2018 12:51:40 -0800 (PST) X-Google-Smtp-Source: AG47ELvj63Z7Z3KxRnx3pgzlg5cb5Pch/c0M18AhsRqY59SXsgWRxFH4a0oeZbG5dNY/4K3bgPua X-Received: by 10.223.144.35 with SMTP id h32mr2425509wrh.2.1520715099984; Sat, 10 Mar 2018 12:51:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520715099; cv=none; d=google.com; s=arc-20160816; b=UXklPQpUKFOn6dy0jgs04ctw6trifk+Gb9cZIxynYcxWDMNoXDLW4j8VW3rlai9/49 D6tXVjxCu6lOzz8+/1DyK8nbpOjdklNv1oz8nmQNqyRNwzfnjeEnByQvB9fB1CfMPO5u 5UW21NgeI93kdw3+GunU553oMglQRCEpEYPeQ/PzZ13O4pcrWM5NZOMyah6J8VAtEsMP 8WboTuYJpehCLfJaGCwt541BhqnXrzpibIlT1YJUZTeMnw84Sedx6USe8PEEy20HaLca k7FOOmrHI2nRGrnpjMnHiQWAj5YSahALNKdS8P8DXaF0rzjqnVX/pVXwinMC+x4JFzvz xcnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=OqvUa/7bDXMotXGlLEAONNock6CMhINwwdWn6CEAeVQ=; b=O2GToX28577LJbvezUTMm8rHGvOAoZ5X4N8gOAqUb4SPCbpdtVKq43Do8jnv9r2w+s D1c0TgNrqFMgAqitOepO8+8iPz9Unk+D6OlUA9IjOLj+36xdO7Y3diMgBQenvdgRzUPC 7Squg0eRwEmM/zf2peYEuIFsq+iRJTpWVSWPFww9c5Efolimj/UDe2hHNCJJ3enwxhtz kKp2oDmqBjErKgD0kv1k97JxRxjnlh8rBMLoTU2ENHM44U9meOoCmQpHy30IAVzALbJO QBIN6Ng1gR4SNQ/PTsodIbfDVVh0JllqPGrzAD85dZ/QMmSqCbeG/IFqr8H9j/p2II62 J13g== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4si2914226wrr.205.2018.03.10.12.51.37; Sat, 10 Mar 2018 12:51:39 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E7DD68A217; Sat, 10 Mar 2018 22:51:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 954A268A202 for ; Sat, 10 Mar 2018 22:51:19 +0200 (EET) Received: from [172.31.218.33] (helo=vie01a-dmta-pe01-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eulSj-0008By-7H for ffmpeg-devel@ffmpeg.org; Sat, 10 Mar 2018 21:51:29 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eulSd-0000nZ-IT for ffmpeg-devel@ffmpeg.org; Sat, 10 Mar 2018 21:51:23 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id LLrK1x00s0S5wYM01LrLe1; Sat, 10 Mar 2018 21:51:20 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 10 Mar 2018 21:51:09 +0100 Message-Id: <20180310205109.3443-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avcodec/h2645_parse: Replace RNXYA by RNXY in ff_h2645_extract_rbsp() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes misaligned accesses Found-by: Matt Wolenetz Signed-off-by: Michael Niedermayer --- libavcodec/h2645_parse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index e6c40381b0..dbf2435677 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -53,8 +53,8 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, i++ #if HAVE_FAST_64BIT for (i = 0; i + 1 < length; i += 9) { - if (!((~AV_RN64A(src + i) & - (AV_RN64A(src + i) - 0x0100010001000101ULL)) & + if (!((~AV_RN64(src + i) & + (AV_RN64(src + i) - 0x0100010001000101ULL)) & 0x8000800080008080ULL)) continue; FIND_FIRST_ZERO; @@ -63,8 +63,8 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, } #else for (i = 0; i + 1 < length; i += 5) { - if (!((~AV_RN32A(src + i) & - (AV_RN32A(src + i) - 0x01000101U)) & + if (!((~AV_RN32(src + i) & + (AV_RN32(src + i) - 0x01000101U)) & 0x80008080U)) continue; FIND_FIRST_ZERO;