From fe7d395afc7d676f0dc1a458edf5f220d6fe987e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 10 Jan 2026 08:26:02 +0000
Subject: [PATCH 1/3] Initial plan
From d94227ebdcce74cadb28a7d10d639bb13faa0d73 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 10 Jan 2026 08:46:31 +0000
Subject: [PATCH 2/3] Fix RUSTSEC-2026-0002: Patch lru vulnerability in
iced_glyphon
Co-authored-by: doublegate <6858123+doublegate@users.noreply.github.com>
---
Cargo.lock | 12 +-
Cargo.toml | 8 +-
vendor/README.md | 22 +
vendor/iced_glyphon/.cargo_vcs_info.json | 6 +
vendor/iced_glyphon/.github/FUNDING.yml | 1 +
vendor/iced_glyphon/.github/workflows/ci.yml | 21 +
vendor/iced_glyphon/.gitignore | 3 +
vendor/iced_glyphon/Cargo.toml | 62 +++
vendor/iced_glyphon/LICENSE-APACHE | 201 ++++++++++
vendor/iced_glyphon/LICENSE-MIT | 23 ++
vendor/iced_glyphon/LICENSE-ZLIB | 15 +
vendor/iced_glyphon/README.md | 29 ++
vendor/iced_glyphon/examples/Inter-Bold.ttf | Bin 0 -> 316100 bytes
vendor/iced_glyphon/examples/hello-world.rs | 176 ++++++++
vendor/iced_glyphon/examples/ligature.txt | 6 +
vendor/iced_glyphon/examples/mono.txt | 213 ++++++++++
vendor/iced_glyphon/src/cache.rs | 248 ++++++++++++
vendor/iced_glyphon/src/error.rs | 44 ++
vendor/iced_glyphon/src/lib.rs | 120 ++++++
vendor/iced_glyphon/src/shader.wgsl | 128 ++++++
vendor/iced_glyphon/src/text_atlas.rs | 360 +++++++++++++++++
vendor/iced_glyphon/src/text_render.rs | 398 +++++++++++++++++++
vendor/iced_glyphon/src/viewport.rs | 57 +++
23 files changed, 2142 insertions(+), 11 deletions(-)
create mode 100644 vendor/README.md
create mode 100644 vendor/iced_glyphon/.cargo_vcs_info.json
create mode 100644 vendor/iced_glyphon/.github/FUNDING.yml
create mode 100644 vendor/iced_glyphon/.github/workflows/ci.yml
create mode 100644 vendor/iced_glyphon/.gitignore
create mode 100644 vendor/iced_glyphon/Cargo.toml
create mode 100644 vendor/iced_glyphon/LICENSE-APACHE
create mode 100644 vendor/iced_glyphon/LICENSE-MIT
create mode 100644 vendor/iced_glyphon/LICENSE-ZLIB
create mode 100644 vendor/iced_glyphon/README.md
create mode 100644 vendor/iced_glyphon/examples/Inter-Bold.ttf
create mode 100644 vendor/iced_glyphon/examples/hello-world.rs
create mode 100644 vendor/iced_glyphon/examples/ligature.txt
create mode 100644 vendor/iced_glyphon/examples/mono.txt
create mode 100644 vendor/iced_glyphon/src/cache.rs
create mode 100644 vendor/iced_glyphon/src/error.rs
create mode 100644 vendor/iced_glyphon/src/lib.rs
create mode 100644 vendor/iced_glyphon/src/shader.wgsl
create mode 100644 vendor/iced_glyphon/src/text_atlas.rs
create mode 100644 vendor/iced_glyphon/src/text_render.rs
create mode 100644 vendor/iced_glyphon/src/viewport.rs
diff --git a/Cargo.lock b/Cargo.lock
index e26e401..81dbf40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2009,12 +2009,10 @@ dependencies = [
[[package]]
name = "iced_glyphon"
version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c3bb56f1820ca252bc1d0994ece33d233a55657c0c263ea7cb16895adbde82"
dependencies = [
"cosmic-text",
"etagere",
- "lru 0.12.5",
+ "lru",
"rustc-hash 2.1.1",
"wgpu",
]
@@ -2413,12 +2411,6 @@ version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-[[package]]
-name = "lru"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
-
[[package]]
name = "lru"
version = "0.16.3"
@@ -3565,7 +3557,7 @@ dependencies = [
"indoc",
"itertools 0.14.0",
"kasuari",
- "lru 0.16.3",
+ "lru",
"strum",
"thiserror 2.0.17",
"unicode-segmentation",
diff --git a/Cargo.toml b/Cargo.toml
index b6388ba..96c2136 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,4 +107,10 @@ strip = true
[profile.bench]
opt-level = 3
-debug = false
\ No newline at end of file
+debug = false
+
+# Security fix for RUSTSEC-2026-0002: IterMut violates Stacked Borrows
+# Patch vulnerable lru 0.12.5 by replacing iced_glyphon with patched version
+# The patched version updates lru from 0.12.1 to 0.16.3 which includes the security fix
+[patch.crates-io]
+iced_glyphon = { path = "vendor/iced_glyphon" }
\ No newline at end of file
diff --git a/vendor/README.md b/vendor/README.md
new file mode 100644
index 0000000..7c7da40
--- /dev/null
+++ b/vendor/README.md
@@ -0,0 +1,22 @@
+# Vendored Dependencies
+
+This directory contains vendored copies of dependencies that have been patched for security or compatibility reasons.
+
+## iced_glyphon
+
+**Reason**: Security patch for RUSTSEC-2026-0002
+**Original version**: 0.6.0
+**Issue**: The original iced_glyphon 0.6.0 depends on lru 0.12.5, which contains a soundness bug where `IterMut` violates Stacked Borrows by invalidating internal pointers.
+
+**Changes made**:
+- Updated `lru` dependency from 0.12.1 to 0.16.3 in Cargo.toml
+
+**Affected versions**: lru 0.9.0 - 0.16.2
+**Fixed version**: lru 0.16.3+
+
+**Upstream tracking**:
+- RustSec Advisory: https://rustsec.org/advisories/RUSTSEC-2026-0002
+- lru-rs PR #224: https://github.com/jeromefroe/lru-rs/pull/224
+- iced_glyphon issue: https://github.com/hecrj/glyphon (no newer version available yet)
+
+**Future**: This patch can be removed once iced_glyphon releases a version that depends on lru 0.16.3 or higher, or when upgrading to iced 0.14+ which may use a different text rendering backend.
diff --git a/vendor/iced_glyphon/.cargo_vcs_info.json b/vendor/iced_glyphon/.cargo_vcs_info.json
new file mode 100644
index 0000000..56451a4
--- /dev/null
+++ b/vendor/iced_glyphon/.cargo_vcs_info.json
@@ -0,0 +1,6 @@
+{
+ "git": {
+ "sha1": "647575039c86faf21518c3064f9dde2dacf16db7"
+ },
+ "path_in_vcs": ""
+}
\ No newline at end of file
diff --git a/vendor/iced_glyphon/.github/FUNDING.yml b/vendor/iced_glyphon/.github/FUNDING.yml
new file mode 100644
index 0000000..d55a828
--- /dev/null
+++ b/vendor/iced_glyphon/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [grovesNL]
diff --git a/vendor/iced_glyphon/.github/workflows/ci.yml b/vendor/iced_glyphon/.github/workflows/ci.yml
new file mode 100644
index 0000000..7e39b36
--- /dev/null
+++ b/vendor/iced_glyphon/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: CI
+
+on:
+ push:
+ branches: [main]
+ pull_request:
+ branches: [main]
+
+env:
+ CARGO_TERM_COLOR: always
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Build
+ run: cargo build --verbose
+ - name: Run tests
+ run: cargo test --verbose
diff --git a/vendor/iced_glyphon/.gitignore b/vendor/iced_glyphon/.gitignore
new file mode 100644
index 0000000..004ae20
--- /dev/null
+++ b/vendor/iced_glyphon/.gitignore
@@ -0,0 +1,3 @@
+/target
+.vscode
+Cargo.lock
diff --git a/vendor/iced_glyphon/Cargo.toml b/vendor/iced_glyphon/Cargo.toml
new file mode 100644
index 0000000..f4d31c0
--- /dev/null
+++ b/vendor/iced_glyphon/Cargo.toml
@@ -0,0 +1,62 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2021"
+name = "iced_glyphon"
+version = "0.6.0"
+build = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
+description = "Fast, simple 2D text rendering for wgpu"
+homepage = "https://github.com/hecrj/glyphon.git"
+readme = "README.md"
+license = "MIT OR Apache-2.0 OR Zlib"
+repository = "https://github.com/hecrj/glyphon"
+
+[lib]
+name = "iced_glyphon"
+path = "src/lib.rs"
+
+[[example]]
+name = "hello-world"
+path = "examples/hello-world.rs"
+
+[dependencies.cosmic-text]
+version = "0.12"
+
+[dependencies.etagere]
+version = "0.2.10"
+
+[dependencies.lru]
+version = "0.16.3"
+default-features = false
+
+[dependencies.rustc-hash]
+version = "2.0"
+
+[dependencies.wgpu]
+version = "0.19"
+features = ["wgsl"]
+default-features = false
+
+[dev-dependencies.pollster]
+version = "0.3.0"
+
+[dev-dependencies.wgpu]
+version = "0.19"
+default-features = true
+
+[dev-dependencies.winit]
+version = "0.29.10"
+features = ["rwh_05"]
diff --git a/vendor/iced_glyphon/LICENSE-APACHE b/vendor/iced_glyphon/LICENSE-APACHE
new file mode 100644
index 0000000..16fe87b
--- /dev/null
+++ b/vendor/iced_glyphon/LICENSE-APACHE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/iced_glyphon/LICENSE-MIT b/vendor/iced_glyphon/LICENSE-MIT
new file mode 100644
index 0000000..31aa793
--- /dev/null
+++ b/vendor/iced_glyphon/LICENSE-MIT
@@ -0,0 +1,23 @@
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/vendor/iced_glyphon/LICENSE-ZLIB b/vendor/iced_glyphon/LICENSE-ZLIB
new file mode 100644
index 0000000..480c61e
--- /dev/null
+++ b/vendor/iced_glyphon/LICENSE-ZLIB
@@ -0,0 +1,15 @@
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
diff --git a/vendor/iced_glyphon/README.md b/vendor/iced_glyphon/README.md
new file mode 100644
index 0000000..d0e2bf3
--- /dev/null
+++ b/vendor/iced_glyphon/README.md
@@ -0,0 +1,29 @@
+
+ 
+ 
+ 
+