Skip to content

Commit 3c79faf

Browse files
committed
minor change for resolving rebase conflicts
1 parent 2fe1094 commit 3c79faf

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
testFailures
2-
| test.go:637:31:637:57 | comment | Missing result:hasValueFlow="tarRead" |
2+
| test.go:636:31:636:57 | comment | Missing result:hasValueFlow="tarRead" |
33
failures

go/ql/test/experimental/CWE-522-DecompressionBombs/test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ func Xz(file io.Reader) {
589589
TarDecompressor(tarRead)
590590
TarDecompressor2(tarRead)
591591
TarDecompressorSafe(tarRead)
592-
TarDecompressorTN(tarRead)
592+
TarDecompressorTP(tarRead)
593593
}
594594

595595
func XzSafe(file io.Reader) {
@@ -629,16 +629,14 @@ func TarDecompressor2(tarRead *tar.Reader) {
629629
tarRead.Read(tarOut) // $ hasValueFlow="tarRead"
630630
fmt.Println("do sth with output:", tarOut)
631631
}
632-
633-
func TarDecompressorTN(tarRead *tar.Reader) {
632+
func TarDecompressorTP(tarRead *tar.Reader) {
634633
var tarOut []byte = make([]byte, 70)
635634
i := 1
636635
for i > 0 {
637636
i, _ = tarRead.Read(tarOut) // $ hasValueFlow="tarRead"
638637
fmt.Println("do sth with output:", tarOut)
639638
}
640639
}
641-
642640
func TarDecompressorSafe(tarRead *tar.Reader) {
643641
var tarOut []byte = make([]byte, 70)
644642
i := 1

0 commit comments

Comments
 (0)