suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file/untar: fix handling of a broken tar file

Browse Source 
Closes #1049
This commit is contained in:
Matthew Flatt 2015-09-11 15:27:22 -06:00
parent 696c9d972f
commit c15d2f71d4
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/racket-test/tests/file/unpackers.rkt
View File

@ -174,8 +174,22 @@
(define (unzip-tests [preserve-timestamps? #f]) (define (unzip-tests [preserve-timestamps? #f])
(when zip-exe (test do (run-tests (make-unzip-tests* preserve-timestamps?))))) (when zip-exe (test do (run-tests (make-unzip-tests* preserve-timestamps?)))))
(define (untar-of-invalid-tests)
;; Make sure we don't get an internal error for this misformatted tar file:
(define bad-tar.gz
(bytes-append #"\37\213\b\b!D\363U\0\3test.tar\0\355\321A\n\302@\f\205\341\254=\305\334\240\223qb\316\323"
#"\205]YZl\274\277V\21\334\210(\fR\370\277M\26\t\344\301\213\343\22\235\264\225o\334m\235"
#"\352\226_\347\223h1\257\207\252V\\\262j\325*\311\32\347\272\273,\321\237S\222q8\365\21\357"
#"\357>\3557*\326\376\207ij\371\343\321\277\177\321\377\336r\221T\272\30\347\326\341\350?v\377"
#"\16\1\0\0\0\0\0\0\0\0\0\0\0\0\340'W\327\1)\27\0(\0\0"))
(test (regexp-match?
#rx"^unt"
(with-handlers ([exn? exn-message])
(untgz (open-input-bytes bad-tar.gz) #:filter (lambda args #f))))))
(module+ main (tests)) (module+ main (tests))
(define (tests) (define (tests)
(test do (untar-tests) (test do (untar-tests)
do (unzip-tests) do (unzip-tests)
do (unzip-tests #t))) do (unzip-tests #t)
do (untar-of-invalid-tests)))

9
racket/collects/file/untar.rkt
View File

@ -162,10 +162,11 @@
;; traditional: ;; traditional:
(define skip-tail (define skip-tail
(- len (- len
(for/or ([i (in-range len 0 -1)]) (or (for/or ([i (in-range len 0 -1)])
(case (integer->char (bytes-ref bstr (sub1 i))) (case (integer->char (bytes-ref bstr (sub1 i)))
[(#\space #\nul) #f] [(#\space #\nul) #f]
[else i])))) [else i]))
(error 'untar "bad number ~e at ~a" bstr (file-position in)))))
(for/fold ([v 0]) ([i (in-range (- len skip-tail))]) (for/fold ([v 0]) ([i (in-range (- len skip-tail))])
(define b (bytes-ref bstr i)) (define b (bytes-ref bstr i))
(if (<= (char->integer #\0) b (char->integer #\7)) (if (<= (char->integer #\0) b (char->integer #\7))