From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 70760385381B for ; Wed, 5 Apr 2023 14:06:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 70760385381B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x42c.google.com with SMTP id m2so36337820wrh.6 for ; Wed, 05 Apr 2023 07:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680703579; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=6qa6ioWd3RxsHQPRQCZ2DmlyVa+90txm0PpOc70Xf0A=; b=ZeUz+v778qUfMlRsG4wjyFBmZd/2tGJY8ML0JbBgEaEmzUHvea64r1RYU9wKflsJRo 5DXtWgerwn7jRfTZsLOHERc1Q3zFcA19dd1WCTtz9mFwgThUCzkQ1vfenwxYW3RgYchC TvOwe1K9lk2cGdmwYw9sPN++DE+kibPN7gBwI+mX6pShMbJssxI3PHl312IGK9meElMZ oR0BowE4w4W259RhFX9N1SqB7U3RosTXKShuv86aQDKH9MRgJqaDRXy781OAnUvGnvEC 2qEj8rQu7p+9dbNKxKCu62ZJwR/9Fut08glNSSTJzzkiHEnIkSXUWqDHj1qaEMMR8mfm 4xUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680703579; h=content-transfer-encoding:mime-version:reply-to: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=6qa6ioWd3RxsHQPRQCZ2DmlyVa+90txm0PpOc70Xf0A=; b=ZDx7n70Ma7a55bRCVQIUWbQ2JY4an853UwokZrC1xez4THTX43OVfU8qqVAXexnbbU 6o6LTYsUm8tE3Ecg1upK7lt1CFVWUPqadumUMIeblaefJ9uvYECb8dQx/bC4/auCC4E6 Azfh2q4RA3lI0z0sk2+cALiulK29vDkb9Xz0hGWqlvUlmtO+jtryA+KqqRqVV2oR5sFO MQ2nHjMgE73glDPBewJWiQ/xTMgWdZjGU8Rd+2n9xRpG6HFNs3UQ21LcJ8rVpW7BR8bF YypQZYmEGqepTN8XegxJlKNu7Jiy7A40PWKvrKXaeW9rKJzWI1z++6KFe4/hv3Bqw27C vV0Q== X-Gm-Message-State: AAQBX9dfFuD4sWKo5hviyN5aUou2P0X4TFasykhiTaLuug7h9vhdZ1or JvbRLRwSAo085Sf95fH9e9+HV8k7PhIEPIjN3g== X-Google-Smtp-Source: AKy350YwXh8sRAdb+AkvlNx4iy86cZgX63RFiGF2GxPcDhIY5THbnLmHYiykRUjp/JQfiHKadCfwVw== X-Received: by 2002:adf:ea90:0:b0:2d5:39d:514f with SMTP id s16-20020adfea90000000b002d5039d514fmr4546751wrm.65.1680703579290; Wed, 05 Apr 2023 07:06:19 -0700 (PDT) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id ay8-20020a05600c1e0800b003edddae1068sm2330150wmb.9.2023.04.05.07.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:06:18 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [committed 72/88] gccrs: Implemented UTF-8 checking for include_str!() Date: Wed, 5 Apr 2023 16:03:56 +0200 Message-Id: <20230405140411.3016563-73-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230405140411.3016563-1-arthur.cohen@embecosm.com> References: <20230405140411.3016563-1-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.5 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: From: Owen Avery gcc/rust/ChangeLog: * expand/rust-macro-builtins.cc (MacroBuiltin::include_str_handler): Add check for valid UTF-8. gcc/testsuite/ChangeLog: * rust/compile/builtin_macro_include_str.rs: Include test of invalid UTF-8. * rust/compile/invalid_utf8: File with invalid UTF-8. Signed-off-by: Owen Avery --- gcc/rust/expand/rust-macro-builtins.cc | 51 ++++++++++++++++++- .../rust/compile/builtin_macro_include_str.rs | 1 + gcc/testsuite/rust/compile/invalid_utf8 | 1 + 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/rust/compile/invalid_utf8 diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index e594a2500d0..3b6f69bbd69 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -389,8 +389,55 @@ MacroBuiltin::include_str_handler (Location invoc_locus, std::vector bytes = load_file_bytes (target_filename.c_str ()); - /* FIXME: Enforce that the file contents are valid UTF-8. */ - std::string str ((const char *) &bytes[0], bytes.size ()); + /* FIXME: reuse lexer */ + int expect_single = 0; + for (uint8_t b : bytes) + { + if (expect_single) + { + if ((b & 0xC0) != 0x80) + /* character was truncated, exit with expect_single != 0 */ + break; + expect_single--; + } + else if (b & 0x80) + { + if (b >= 0xF8) + { + /* more than 4 leading 1s */ + expect_single = 1; + break; + } + else if (b >= 0xF0) + { + /* 4 leading 1s */ + expect_single = 3; + } + else if (b >= 0xE0) + { + /* 3 leading 1s */ + expect_single = 2; + } + else if (b >= 0xC0) + { + /* 2 leading 1s */ + expect_single = 1; + } + else + { + /* only 1 leading 1 */ + expect_single = 1; + break; + } + } + } + + std::string str; + if (expect_single) + rust_error_at (invoc_locus, "%s was not a valid utf-8 file", + target_filename.c_str ()); + else + str = std::string ((const char *) &bytes[0], bytes.size ()); auto node = AST::SingleASTNode (make_string (invoc_locus, str)); auto str_tok = make_token (Token::make_string (invoc_locus, std::move (str))); diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_str.rs b/gcc/testsuite/rust/compile/builtin_macro_include_str.rs index 38f5e3b7334..8092193195d 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_include_str.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_include_str.rs @@ -10,4 +10,5 @@ fn main () { include_str! ("foo.txt", "bar.txt"); // { dg-error "macro takes 1 argument" "" } include_str! ("builtin_macro_include_str.rs"); // ok include_str! ("builtin_macro_include_str.rs",); // trailing comma ok + include_str! ("invalid_utf8"); // { dg-error "invalid_utf8 was not a valid utf-8 file" "" } } diff --git a/gcc/testsuite/rust/compile/invalid_utf8 b/gcc/testsuite/rust/compile/invalid_utf8 new file mode 100644 index 00000000000..29e181ebb88 --- /dev/null +++ b/gcc/testsuite/rust/compile/invalid_utf8 @@ -0,0 +1 @@ +ÿ -- 2.40.0