From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id D9F183851162 for ; Thu, 27 Oct 2022 23:17:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9F183851162 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com Received: by mail-qk1-x735.google.com with SMTP id i10so2228454qkl.12 for ; Thu, 27 Oct 2022 16:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WD7Nl3PzdQINQhUMU6SJY7Al+WrwPD5f/oQH2DRtcQI=; b=dkNQEbWdawB3V4t3w5aYo5rrEwZB3VA6pgHld4Dc30rOc4ZC74XFA5IVtNGOkJZVMQ khW++RSzfyBsQu+OpYMhIqG2qsvtqmX/TiRnWQEh9S3q4AvgF+wv23ibMmStx708nzQT uKnG6wc1ElhehhjUbaYX1BKCe8XdWUz1myPfQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WD7Nl3PzdQINQhUMU6SJY7Al+WrwPD5f/oQH2DRtcQI=; b=s2HUeDiA7Y7yc+pONRems1I0xyvl7XilPI2tiswJ2pim2UrE8+jWmXzBvvCRyEn90i Ypyk+MI6EbWmuH5eRyO3PQ7S1RJnmlTnjWKCRlyrAFWzoXgX9lzBzYNrY+m9Lo6kg9rO 5iaoZsJI6bXJLOrgx89DT+8YtUVkvkQClJ9tvda3mPDjjTticZtyR4aNj/ZALtciEchJ Wg1qH7+vUmRBXDgEZRVb5l59NobsdPwpP/9iYil6+cLJ/THvHZyI/sqju9GvSb9yaZLP ieiNI4nms2Vg+L8h11HABtkFWul7of8OQFF3ZQMz+O1+0wo8scGcWG2iwTgpDGAk5Ryr MAxg== X-Gm-Message-State: ACrzQf0RXiJDTGW42KTeqeCbYcoaQldYJoUBHXc8Qoyakx8oYxp2hiPc 0Lg4B/LVylZr0IQCNvUQT6IghA== X-Google-Smtp-Source: AMsMyM6fbiaTt7+sHhfFJ9qn9wk/Xk6UCGNLmEIXUh3N/A1r3PQcn4c9BTOKr+1nTWdBjSTgacFAcQ== X-Received: by 2002:ae9:e8c2:0:b0:6f9:2661:b674 with SMTP id a185-20020ae9e8c2000000b006f92661b674mr7735819qkg.392.1666912627197; Thu, 27 Oct 2022 16:17:07 -0700 (PDT) Received: from localhost (cpe-142-105-146-128.nycap.res.rr.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id d17-20020a05622a15d100b003434d3b5938sm1620908qty.2.2022.10.27.16.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 16:17:06 -0700 (PDT) From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: Ben Boeckel , jason@redhat.com, nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org, brad.king@kitware.com, dmalcolm@redhat.com, mliska@suse.cz, anlauf@gmx.de Subject: [PATCH v2 1/3] libcpp: reject codepoints above 0x10FFFF Date: Thu, 27 Oct 2022 19:16:42 -0400 Message-Id: <20221027231645.67623-2-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221027231645.67623-1-ben.boeckel@kitware.com> References: <20221027231645.67623-1-ben.boeckel@kitware.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Unicode does not support such values because they are unrepresentable in UTF-16. Signed-off-by: Ben Boeckel --- libcpp/ChangeLog | 6 ++++++ libcpp/charset.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 18d5bcceaf0..4d707277531 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2022-10-27 Ben Boeckel + + * include/charset.cc: Reject encodings of codepoints above 0x10FFFF. + UTF-16 does not support such codepoints and therefore all Unicode + rejects such values. + 2022-10-19 Lewis Hyatt * include/cpplib.h (struct cpp_string): Use new "string_length" GTY. diff --git a/libcpp/charset.cc b/libcpp/charset.cc index 12a398e7527..e9da6674b5f 100644 --- a/libcpp/charset.cc +++ b/libcpp/charset.cc @@ -216,7 +216,7 @@ one_utf8_to_cppchar (const uchar **inbufp, size_t *inbytesleftp, if (c <= 0x3FFFFFF && nbytes > 5) return EILSEQ; /* Make sure the character is valid. */ - if (c > 0x7FFFFFFF || (c >= 0xD800 && c <= 0xDFFF)) return EILSEQ; + if (c > 0x10FFFF || (c >= 0xD800 && c <= 0xDFFF)) return EILSEQ; *cp = c; *inbufp = inbuf; @@ -320,7 +320,7 @@ one_utf32_to_utf8 (iconv_t bigend, const uchar **inbufp, size_t *inbytesleftp, s += inbuf[bigend ? 2 : 1] << 8; s += inbuf[bigend ? 3 : 0]; - if (s >= 0x7FFFFFFF || (s >= 0xD800 && s <= 0xDFFF)) + if (s > 0x10FFFF || (s >= 0xD800 && s <= 0xDFFF)) return EILSEQ; rval = one_cppchar_to_utf8 (s, outbufp, outbytesleftp); -- 2.37.3