From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8B54840B08 for ; Fri, 6 May 2022 13:58:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 885E668B35B; Fri, 6 May 2022 16:58:04 +0300 (EEST) Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FA5868B2AE for ; Fri, 6 May 2022 16:57:58 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 246DvvRX029379 for ; Fri, 6 May 2022 15:57:57 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id 65200E00F5; Fri, 6 May 2022 15:57:57 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 15:57:51 +0200 Message-Id: <20220506135751.112173-1-george@nsup.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Fri, 06 May 2022 15:57:57 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH] lavu/common: fix PUT_UTF8() length 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Ensure the input is <= 31 bits because otherwise it would produce very invalid UTF-8. Document that the length can be up to 6 bytes, because that is what the code does. The FLAC encoder abuses UTF-8 to store 32-bits integers, limiting PUT_UTF8() to 21 bits might affect some real cases negatively. Signed-off-by: Nicolas George --- libavutil/common.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavutil/common.h b/libavutil/common.h index fd1404be6c..7a71be3c81 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -505,7 +505,9 @@ static av_always_inline av_const int av_parity_c(uint32_t v) /** * @def PUT_UTF8(val, tmp, PUT_BYTE) - * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long). + * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 6 + * bytes long, but codes more than 4 bytes long, i.e. codepoints above + * 0x001FFFFF, are deprecated). * @param val is an input-only argument and should be of type uint32_t. It holds * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If * val is given as a function it is executed only once. @@ -522,7 +524,7 @@ static av_always_inline av_const int av_parity_c(uint32_t v) #define PUT_UTF8(val, tmp, PUT_BYTE)\ {\ int bytes, shift;\ - uint32_t in = val;\ + uint32_t in = val & 0x7FFFFFFF;\ if (in < 0x80) {\ tmp = in;\ PUT_BYTE\ -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".