Merge branch 'master' into unknown-tests-issue-3038

iBotPeaches · May 27, 2023 · 6e4f53a · 6e4f53a
2 parents ee5d59a + 636b1a1
commit 6e4f53a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/ClassSafeConstructor.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/ClassSafeConstructor.java
@@ -19,6 +19,7 @@
 import org.yaml.snakeyaml.constructor.AbstractConstruct;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.ScalarNode;
 import org.yaml.snakeyaml.nodes.Tag;
@@ -29,6 +30,7 @@ public class ClassSafeConstructor extends Constructor {
     protected final List<Class<?>> allowableClasses = new ArrayList<>();
 
     public ClassSafeConstructor() {
+        super(new LoaderOptions());
         this.yamlConstructors.put(Tag.STR, new ConstructStringEx());
 
         this.allowableClasses.add(MetaInfo.class);

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java
@@ -16,11 +16,13 @@
  */
 package brut.androlib.meta;
 
+import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.representer.Representer;
 
 public class EscapedStringRepresenter extends Representer {
     public EscapedStringRepresenter() {
+        super(new DumperOptions());
         RepresentStringEx representStringEx = new RepresentStringEx();
         multiRepresenters.put(String.class, representStringEx);
         representers.put(String.class, representStringEx);