gentoo resync : 28.04.2021

1 files changed, 14 insertions, 0 deletions

diff --git a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
new file mode 100644
index 000000000000..fe903380fd61
--- /dev/null
+++ b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
@@ -0,0 +1,14 @@
+diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
+index e87f330..28c836b 100644
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
+@@ -69,7 +69,8 @@ public class BillionLaughsAttackTest {
+             map.toString();
+             fail("Expected overflow");
+         } catch (Throwable e) {
+-            assertTrue(e.getMessage().contains("heap"));
++            final String message = e.getMessage();
++            assertTrue(message == null || message.contains("heap"));
+         }
+     }
+