From fcdd099a967e7f661eb2ddf28fdb06f46c188194 Mon Sep 17 00:00:00 2001 From: Roland Shoemaker Date: Thu, 14 Jul 2022 12:09:19 -0700 Subject: [PATCH] [release-branch.go1.18] encoding/xml: skip TestCVE202230633 for short tests TestCVE202230633 uses a bunch of memory, and the input cannot be feasibly reduced while maintaining the behavior hasn't regressed. This test could be reasonably removed, but I'd rather keep it around if we can. Updates #53814. Fixes #54128. Change-Id: Ie8b3f306efd20b2d9c0fb73122c26351a55694c4 Reviewed-on: https://go-review.googlesource.com/c/go/+/417655 Run-TryBot: Roland Shoemaker TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills (cherry picked from commit 783ff7dfc49d207114bb80e565e50ea6ff079326) Reviewed-on: https://go-review.googlesource.com/c/go/+/421094 Reviewed-by: Cherry Mui Run-TryBot: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov --- src/encoding/xml/read_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/encoding/xml/read_test.go b/src/encoding/xml/read_test.go index de5282aff0..1362f7f287 100644 --- a/src/encoding/xml/read_test.go +++ b/src/encoding/xml/read_test.go @@ -9,7 +9,6 @@ import ( "errors" "io" "reflect" - "runtime" "strings" "testing" "time" @@ -1084,8 +1083,8 @@ func TestUnmarshalWhitespaceAttrs(t *testing.T) { } func TestCVE202230633(t *testing.T) { - if runtime.GOARCH == "wasm" { - t.Skip("causes memory exhaustion on js/wasm") + if testing.Short() { + t.Skip("test requires significant memory") } defer func() { p := recover() -- 2.50.0