From patchwork Wed Jan 22 14:52:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17469 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 AC87944B95F for ; Wed, 22 Jan 2020 16:57:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8698968B21C; Wed, 22 Jan 2020 16:57:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF69868AF79 for ; Wed, 22 Jan 2020 16:57:42 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id u2so7524880wmc.3 for ; Wed, 22 Jan 2020 06:57:42 -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:mime-version :content-transfer-encoding; bh=mOOBUQM1UD32MQMUdFdD+hrtVOST+N2GF3FbcAhh5f4=; b=qN0z58vNP8wukQmLhM1D4VqqKiNKLNTpkNDRIJJI7rVw307WCM51QFrhRzeIR6bl5O gPgR5PTbADCnohKb4lEyu8HvP4ADlDoMYZ2vWFujbXXn1Ipk8jDFt9pD+RDs+Go2rY/+ vrlI6m3wcYwCG/FclLQmpk2AFMx6vDR8X3WeE/RggDkvRV1DoTt2VOsRQJmgte67XR8L BLLfszDpYOcxDulOwOiQPwmAWpctN7Lr0u2zYPISC4eZcK/XWTkWHvhAHxvKFJkRzeuh VzKvoEkhy2AXbQyti8YgQIo1aw4pYTMDGQvnuhXQ0oy0wdYqEwnl7pZZzLLV2QHBGJAz zYgg== 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=mOOBUQM1UD32MQMUdFdD+hrtVOST+N2GF3FbcAhh5f4=; b=iuHGrowSP/pyuBKPJlRqPCya+QggFbwQRpOsEtZa7SBYXWvyMJeRPnrVxYLggharg5 Bml9POuNDc36zEN/lbqEAR8+LApI/aiF/NCVjURs6PjSZCSk1wx6+3qCatquVf3QCLiO vUn9/LSL8HqUpARBjKbsVm77pYZ00nGZHIgGNB/c0l4PAI6SGtrbVlqHk/wwPYQQzgf5 kKiVLq6gj8Duwurkx6FqNPnCgozF1OBxTRmnUDEe7bGaGdVbiDI6smehQua3QdjyfOc8 4hqIepQ6GYbONm20DoncxHzP3T6dO++BDL/PbduO5amKmHYnqeSIY6+ac+RHLiYDk586 T7IQ== X-Gm-Message-State: APjAAAX99vs2oaAAsnP7nRt44gq5uZcAguOtSTp9TuALU58B/jqhg0Y4 0Vw5Rov5bHrT7+3VoiVOhtCZlmtp X-Google-Smtp-Source: APXvYqwMaKilHAHGk6eD8F6cerYLpFxt8aTUIybPjbOxOaIZfnJW3Lz4sz7t7I/ZcH+Vm7LZpwShZg== X-Received: by 2002:a1c:1b15:: with SMTP id b21mr3310294wmb.17.1579704739887; Wed, 22 Jan 2020 06:52:19 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id t81sm4452092wmg.6.2020.01.22.06.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 06:52:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jan 2020 15:52:07 +0100 Message-Id: <20200122145210.6898-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/startcode: Use AV_RN due to UBSan warning about unaligned access 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" when directly accessing a buffer via a pointer to uint8_t cast to a pointer to uint64_t/uint32_t. This happened only if HAVE_FAST_UNALIGNED was set, so it was ok, but UBSan nevertheless complained about unaligned accesses. So simply use AV_RNxx to read the buffer; this also improves readability. This affected many FATE-tests (namely 228 of them; e.g. the cbs-h264 tests) and it has also been reported in tickets #8138 and #8485. Signed-off-by: Andreas Rheinhardt --- libavcodec/startcode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/startcode.c b/libavcodec/startcode.c index 9efdffe8c6..d84f326521 100644 --- a/libavcodec/startcode.c +++ b/libavcodec/startcode.c @@ -25,6 +25,7 @@ * @author Michael Niedermayer */ +#include "libavutil/intreadwrite.h" #include "startcode.h" #include "config.h" @@ -38,14 +39,14 @@ int ff_startcode_find_candidate_c(const uint8_t *buf, int size) */ #if HAVE_FAST_64BIT while (i < size && - !((~*(const uint64_t *)(buf + i) & - (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) & + !((~AV_RN64(buf + i) & + (AV_RN64(buf + i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL)) i += 8; #else while (i < size && - !((~*(const uint32_t *)(buf + i) & - (*(const uint32_t *)(buf + i) - 0x01010101U)) & + !((~AV_RN32(buf + i) & + (AV_RN32(buf + i) - 0x01010101U)) & 0x80808080U)) i += 4; #endif