From 584dd5fec69ad80feedf4018e02b427f2c812716 Mon Sep 17 00:00:00 2001
From: +merlan #flirora <flirora@flirora.xyz>
Date: Fri, 27 Jun 2025 05:26:15 -0400
Subject: [PATCH] Fix panic when sampling across two coincident gradient stops
 (#6166)

---
 .../typst-library/src/visualize/gradient.rs   |  21 +++++---------
 ...2-coincident-gradient-stops-export-png.png | Bin 0 -> 522 bytes
 tests/suite/visualize/gradient.typ            |  26 ++++++++++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 tests/ref/issue-6162-coincident-gradient-stops-export-png.png

diff --git a/crates/typst-library/src/visualize/gradient.rs b/crates/typst-library/src/visualize/gradient.rs
index 5d7859a37..4917da68d 100644
--- a/crates/typst-library/src/visualize/gradient.rs
+++ b/crates/typst-library/src/visualize/gradient.rs
@@ -1285,24 +1285,17 @@ fn process_stops(stops: &[Spanned<GradientStop>]) -> SourceResult<Vec<(Color, Ra
 /// Sample the stops at a given position.
 fn sample_stops(stops: &[(Color, Ratio)], mixing_space: ColorSpace, t: f64) -> Color {
     let t = t.clamp(0.0, 1.0);
-    let mut low = 0;
-    let mut high = stops.len();
+    let mut j = stops.partition_point(|(_, ratio)| ratio.get() < t);
 
-    while low < high {
-        let mid = (low + high) / 2;
-        if stops[mid].1.get() < t {
-            low = mid + 1;
-        } else {
-            high = mid;
+    if j == 0 {
+        while stops.get(j + 1).is_some_and(|(_, r)| r.is_zero()) {
+            j += 1;
         }
+        return stops[j].0;
     }
 
-    if low == 0 {
-        low = 1;
-    }
-
-    let (col_0, pos_0) = stops[low - 1];
-    let (col_1, pos_1) = stops[low];
+    let (col_0, pos_0) = stops[j - 1];
+    let (col_1, pos_1) = stops[j];
     let t = (t - pos_0.get()) / (pos_1.get() - pos_0.get());
 
     Color::mix_iter(
diff --git a/tests/ref/issue-6162-coincident-gradient-stops-export-png.png b/tests/ref/issue-6162-coincident-gradient-stops-export-png.png
new file mode 100644
index 0000000000000000000000000000000000000000..d269342c7c6678e525f62b7d85b080e2fcfd812d
GIT binary patch
literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq004LZ004#v0{{R3AtJts0003~P)t-s|Ns90
zdDH-W(g1$Y0D;W_gUbMg$N-4O0E)x_jKKhozW|WD0F$`@mA3$wv;dj10GqD>ovZ+#
zsQ{s;0HdS;q@e(&o&czu0IHY(td#(+k^rxc0I`bzvxoq-gaNjJ2Dp6-x_J=1brijE
z7r$*A!Dt@BWFf>~BgR@L$5biFPAkesF3dnb%0NuWKv%{;VZ=Xa!as4pKX|=9e!D(|
zxju@wK996Ml(IdUusxowJ)^5Vr>H%vraZ5tJhP!Zx1Kz^oIAdmJHnSc#gseAkvq(e
zI?szb(ug|Mg*w=RIop3Z-h4UXcsb;CIp%RV>1{adX*lj>IPqaO^IbRgSU31nH~LLB
z{YN(cK{fz)*Z)X7|5Qf*UQqvNS^sik|9flygmnLmegBk(|DBHirI-J#pZ~O||GcsP
z#JT^=!vE9D|Ju|4;@tn~<^S;Q|M>PEWWQwq0044HL_t(|+U?k}4S+BVMZvHS3uOzY
zVjd*+!IU&9Nax7+DtA|ZH%VHq?K}7QUq8WMFc=I5gTY`h7@QckcO|LRXRpUZHy8{C
zgTY`h7z_r36T|kdB$fK?wIfDd&!_-{!C){L3<iV2U~ppC-j!6Z7q(WHJPu}VG5`Po
M07*qoM6N<$f<RjGIRF3v

literal 0
HcmV?d00001

diff --git a/tests/suite/visualize/gradient.typ b/tests/suite/visualize/gradient.typ
index 811b8b605..8446ca030 100644
--- a/tests/suite/visualize/gradient.typ
+++ b/tests/suite/visualize/gradient.typ
@@ -666,3 +666,29 @@ $ A = mat(
 #let _ = gradient.linear(..my-gradient.stops())
 #let my-gradient2 = gradient.linear(red, blue).repeat(5, mirror: true)
 #let _ = gradient.linear(..my-gradient2.stops())
+
+--- issue-6162-coincident-gradient-stops-export-png ---
+// Ensure that multiple gradient stops with the same position
+// don't cause a panic.
+#rect(
+  fill: gradient.linear(
+    (red, 0%),
+    (green, 0%),
+    (blue, 100%),
+  )
+)
+#rect(
+  fill: gradient.linear(
+    (red, 0%),
+    (green, 100%),
+    (blue, 100%),
+  )
+)
+#rect(
+  fill: gradient.linear(
+    (white, 0%),
+    (red, 50%),
+    (green, 50%),
+    (blue, 100%),
+  )
+)