From 8f72fdb875701848de51f23c7145c7613c904978 Mon Sep 17 00:00:00 2001
From: Qendolin <32160662+Qendolin@users.noreply.github.com>
Date: Thu, 15 Apr 2021 13:26:44 +0200
Subject: [PATCH 1/2] Always restore stack in endFormObject

Fixes issue #3127
---
 src/jspdf.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/jspdf.js b/src/jspdf.js
index 4f3a96bb8..879a9a2d3 100644
--- a/src/jspdf.js
+++ b/src/jspdf.js
@@ -5689,7 +5689,10 @@ function jsPDF(options) {
 
   var endFormObject = function(key) {
     // only add it if it is not already present (the keys provided by the user must be unique!)
-    if (renderTargetMap[key]) return;
+    if (renderTargetMap[key]) {
+      renderTargetStack.pop().restore();
+      return;
+    }
 
     // save the created xObject
     var newXObject = new RenderTarget();

From ced2e6ee2bfe1cac71324775efa6ac601a29ca92 Mon Sep 17 00:00:00 2001
From: Qendolin <32160662+Qendolin@users.noreply.github.com>
Date: Thu, 15 Apr 2021 14:24:35 +0200
Subject: [PATCH 2/2] Add endFormObject test

---
 test/specs/jspdf.unit.spec.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/test/specs/jspdf.unit.spec.js b/test/specs/jspdf.unit.spec.js
index cf3a25ae9..dc54ea7fd 100644
--- a/test/specs/jspdf.unit.spec.js
+++ b/test/specs/jspdf.unit.spec.js
@@ -3056,8 +3056,7 @@ This is a test too.`,
     writeArray = [];
     doc.__private__.setCustomOutputDestination(writeArray);
     doc.__private__.putStream({
-      data:
-        "x\u009C+.)JMÌuI,I\u0004\u0000\u0016Ò\u0004\u0007",
+      data: "x\u009C+.)JMÌuI,I\u0004\u0000\u0016Ò\u0004\u0007",
       alreadyAppliedFilters: ["/FlateDecode"]
     });
     expect(bufferFromString(writeArray.join("\n"))).toEqual(expected);
@@ -3100,6 +3099,7 @@ This is a test too.`,
       objId: 3,
       contentsObjId: 4
     });
+
     expect(writeArray).toEqual([
       "3 0 obj",
       "<</Type /Page",
@@ -3607,6 +3607,25 @@ This is a test too.`,
       "%%EOF"
     ]);
   });
+
+  it("jsPdf public function beginFormObject, endFormObject", () => {
+    var doc = jsPDF();
+    var startContext = doc.internal.getCurrentPageInfo().pageContext;
+    doc.beginFormObject(0, 0, 100, 100, new doc.internal.Matrix(1, 0, 0, 1, 0, 0));
+    expect(doc.internal.getCurrentPageInfo().pageContext).not.toEqual(
+      startContext
+    );
+    doc.endFormObject("testFormObject");
+    expect(doc.internal.getCurrentPageInfo().pageContext).toEqual(startContext);
+
+    // Adding a form object with the same id twice should keep stack intact
+    doc.beginFormObject(0, 0, 100, 100, new doc.internal.Matrix(1, 0, 0, 1, 0, 0));
+    expect(doc.internal.getCurrentPageInfo().pageContext).not.toEqual(
+      startContext
+    );
+    doc.endFormObject("testFormObject");
+    expect(doc.internal.getCurrentPageInfo().pageContext).toEqual(startContext);
+  });
 });
 
 function bufferFromString(string) {