From d01a0bd0c83cf39efe0637c20abb64f54c95a6ab Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Mon, 8 Apr 2024 16:01:30 +0200
Subject: [PATCH] Fix annotation border style parsing by handling empty dash
 arrays

The PDF specification states that empty dash arrays, i.e. arrays with
zero elements, are in fact valid. In that case the dash array simply
corresponds to a solid, unbroken line. However, this case was erroneously
being flagged as invalid and therefore the annotation was not drawn
because its width was set to zero. This commit fixes the issue by
allowing dash arrays to have a length of zero.
---
 src/core/annotation.js       |   8 ++++----
 test/pdfs/.gitignore         |   1 +
 test/pdfs/issue17904.pdf     | Bin 0 -> 1693 bytes
 test/test_manifest.json      |   8 ++++++++
 test/unit/annotation_spec.js |   9 +++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 test/pdfs/issue17904.pdf

diff --git a/src/core/annotation.js b/src/core/annotation.js
index 5cff3439e..b5ab35857 100644
--- a/src/core/annotation.js
+++ b/src/core/annotation.js
@@ -1474,9 +1474,9 @@ class AnnotationBorderStyle {
     // We validate the dash array, but we do not use it because CSS does not
     // allow us to change spacing of dashes. For more information, visit
     // http://www.w3.org/TR/css3-background/#the-border-style.
-    if (Array.isArray(dashArray) && dashArray.length > 0) {
-      // According to the PDF specification: the elements in `dashArray`
-      // shall be numbers that are nonnegative and not all equal to zero.
+    if (Array.isArray(dashArray)) {
+      // The PDF specification states that elements in the dash array, if
+      // present, must be non-negative numbers and must not all equal zero.
       let isValid = true;
       let allZeros = true;
       for (const element of dashArray) {
@@ -1488,7 +1488,7 @@ class AnnotationBorderStyle {
           allZeros = false;
         }
       }
-      if (isValid && !allZeros) {
+      if (dashArray.length === 0 || (isValid && !allZeros)) {
         this.dashArray = dashArray;
 
         if (forceStyle) {
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index b3649ac87..b4de951e1 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -514,6 +514,7 @@
 !issue11549_reduced.pdf
 !issue8097_reduced.pdf
 !issue15262.pdf
+!issue17904.pdf
 !bug1743245.pdf
 !quadpoints.pdf
 !transparent.pdf
diff --git a/test/pdfs/issue17904.pdf b/test/pdfs/issue17904.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6669cde7c6c6079ee898f85aa6b2bb4a32dda8b6
GIT binary patch
literal 1693
zcmY!laB<T$)HCN*ef0SJWnL~r1p|frq%2+=8-3@Z)Wnj^{5+S$l2i>BD<cCV69W?i
z3qvDgGgHebO?}_|6kJjPMfoYE$*DyeK+{8t^79mcv|nn8jzXBBfu4bZv0+S}rhY+U
zdTM-eW>spm0nk!YOH(}~3k3@kLp=-2SUWr3)VvgsLyQm(3IJ*-Rxkz%1nGxV7NqJs
zCzd4U<frS0r4|(f9jb4rXM)gZg3#!gmzQ5stY8Y(>71WelA2di9Bl^T#sa;WU*MEq
zfyEK}zNsmhi8$l}5{rPQKwT4*TAW{6l$=@&3^q5Q`9R7eHK#1KBr`ct*WA>=Lcttt
zH$u?T(9{?z7?PQrTC5wCpPQJcYiwj;s9*t7YiFk);h&V1nhZ3|4hZyv@=Jgbp<n><
zIw&j<eg%028f$KuIVGt@`ffQu#V)DI`6;RTKB;->B^e5a#)d#0#U;RK&E=|?BYVo0
z>rjAz>%+P*!>to6{!eCC(l~a?D~(x9i!1QL-{#J<y6=8|V{N&z``qN7`POS*8^-Rx
z`_ncyZtkfAD_TmK4c7=8oRg89YtZ_8VWRH_LtjpQzizSQB@-skbX|4f6UWWGb%JlC
zx^q1<y?=9`<MHoJmO0eAJ;Hy5Xb-FXUlyeRE?^8pTmy@1Lr~n}_J><$QE`ca3Cuqx
z=K6jLhLGR@hE#A#F0%KG!wdp8Y`j>0PXDZSpuv^z=X^B#%mNJpIJ&O#uhj9l%J1Rh
zue)tCGsD$W+?80If|Pu)1S!-hhH$r7SO6Vkj>|DyCnjd!HV|n0f9hdv#-Xg&es(7d
zH5<(`BNR1NPrhgu=t|N)+N&&jJd-o|f9;LCn}Uw9CGX~Mf7f!ay0o9Eg{5O5yDhKg
z1UChiqnZMar#Ms;LxsdN6?|q}x4iuHCnjdrT-nO-ZvSmH+e#-&7CtqaFaFN)j_A8X
zZ@ZFhZ?AuKc(Ul{!;_bqbwA78|354}F6XV@oL_4T>sOj&pHcETnsD*Pk);wL*RHgd
zI|tuB_rYgTO3IsweWg9}6a5AJcO|jt9OGWA9JZiyu}kwL&n2QOEIKPRkA-s=KAziZ
zrhoLw-f31@cYUlTP4IkXbS3lH!>(&aAzhX()9xsr(L5F!eurs$T>jZ+R*~S@SGli7
zWuz5bM`>T!^l@{J-M<@>;^)fxtuwR?-`m`myYpOJ|LJLGyOUSG+N{g6%h{$^y=2{t
z@VpK8uhv<cY<*e7`7XWmsd?E0?|9bqgX}rV7QFA=T_gWx?5>SuTYfM#GuH0o&fKVd
zw`MKdX}a6DK<vuZdu;K$*YoJj`E0Lvp`3$-<x4cjnfHnXM>sPs1%BGaG_|2C^vIWV
zt~vXbZkTpyP4Mj2DVn0|w#Kv?olnhpbgxUI*R$%=brBOYxey;gVU1<Snx{#q{`qgv
zbL&UBL|gaL9n5vbYHz;pXPm!X<`I@u1S)c%2^x|afyG8HsFZNd&neB#D+Z?KfFfWi
zlU$Ntq+n<S%;s1Uo2N^(Mp=xpfvIDRv6)$2jFF*%u2GDUnGsOT5QwevQe%wFjiWRb
zh*K7;@0pjDuK+6QgJ22R%m7%x<d-ObirXOlU|^}NU}y$O&JjVWY5L*OhCn$(P{9l@
zL2{273N{#supX>lu8_2-(b31og+VkgiOJbyzNi1@%}f$fhxVFpsQ6|TCbsMx$DiPH
l;YEsaHQ70wt(YNIT#{H+Qc;we#%pM7Zo;do>gw;t1pp-Cb$S2*

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index e2adb07e9..ad3351073 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -3858,6 +3858,14 @@
     "type": "eq",
     "annotations": true
   },
+  {
+    "id": "issue17904",
+    "file": "pdfs/issue17904.pdf",
+    "md5": "4b8f0b565a61bf068ef72d232c997cef",
+    "rounds": 1,
+    "type": "eq",
+    "annotations": true
+  },
   {
     "id": "issue6179_reduced",
     "file": "pdfs/issue6179_reduced.pdf",
diff --git a/test/unit/annotation_spec.js b/test/unit/annotation_spec.js
index 9cb865eb0..5432a4ab6 100644
--- a/test/unit/annotation_spec.js
+++ b/test/unit/annotation_spec.js
@@ -549,6 +549,15 @@ describe("annotation", function () {
       expect(borderStyle.dashArray).toEqual([3]);
     });
 
+    it("should not set the width to zero if the dash array is empty (issue 17904)", function () {
+      const borderStyle = new AnnotationBorderStyle();
+      borderStyle.setWidth(3);
+      borderStyle.setDashArray([]);
+
+      expect(borderStyle.width).toEqual(3);
+      expect(borderStyle.dashArray).toEqual([]);
+    });
+
     it("should set and get a valid horizontal corner radius", function () {
       const borderStyle = new AnnotationBorderStyle();
       borderStyle.setHorizontalCornerRadius(3);