Create mutable copies in BaseProcessor

asciidoctor · Jun 18, 2023 · cfa68db · cfa68db
1 parent e1baca9
commit cfa68db
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/asciidoctorj-api/src/main/java/org/asciidoctor/extension/BaseProcessor.java b/asciidoctorj-api/src/main/java/org/asciidoctor/extension/BaseProcessor.java
@@ -219,9 +219,10 @@ public Block createBlock(StructuralNode parent, String context, String content,
 
     @Override
     public Block createBlock(StructuralNode parent, String context, String content, Map<String, Object> attributes, Map<Object, Object> options) {
-        options.put(Options.SOURCE, content);
-        options.put(Options.ATTRIBUTES, attributes);
-        return createBlock(parent, context, options);
+        Map<Object, Object> optionsCopy = new HashMap<>(options);
+        optionsCopy.put(Options.SOURCE, content);
+        optionsCopy.put(Options.ATTRIBUTES, attributes);
+        return createBlock(parent, context, optionsCopy);
     }
 
     @Override
@@ -237,11 +238,11 @@ public Block createBlock(StructuralNode parent, String context, List<String> con
     @Override
     public Block createBlock(StructuralNode parent, String context, List<String> content, Map<String, Object> attributes,
                              Map<Object, Object> options) {
+        Map<Object, Object> optionsCopy = new HashMap<>(options);
+        optionsCopy.put(Options.SOURCE, content);
+        optionsCopy.put(Options.ATTRIBUTES, new HashMap<>(attributes));
 
-        options.put(Options.SOURCE, content);
-        options.put(Options.ATTRIBUTES, new HashMap<>(attributes));
-
-        return createBlock(parent, context, options);
+        return createBlock(parent, context, optionsCopy);
     }
 
     @Override