diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2016-12-06 01:35:27 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2016-12-06 01:35:27 +0000 |
| commit | a2e802b76bf44204b2ada3935e96cc46d8176c08 (patch) | |
| tree | 59c73c03055d300edb6aef58c06c26cede4e3fa3 /contrib/libarchive/cat | |
| parent | 1175b23f779571351f8c98aa0f7608decab0c08f (diff) | |
| parent | 36f3c6516a97ac526e7eb80728aa2af5b0d1f1df (diff) | |
| download | src-a2e802b76bf44204b2ada3935e96cc46d8176c08.tar.gz src-a2e802b76bf44204b2ada3935e96cc46d8176c08.zip | |
MFV r309587:
Sync libarchive with vendor.
Vendor bugfixes:
libarchive #831:
Spelling fixes
libarchive #832:
Relax sanity checks of number fields in tar header even more
OSS-Fuzz #16:
Fix possible hang in uudecode_filter_read()
OSS-Fuzz #220:
Reject an 'ar' filename table larger than 1GB or a filename larger
than 1MB.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=309590
Diffstat (limited to 'contrib/libarchive/cat')
| -rw-r--r-- | contrib/libarchive/cat/test/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libarchive/cat/test/main.c b/contrib/libarchive/cat/test/main.c index a57984294fe4..cdfdd9bd6d75 100644 --- a/contrib/libarchive/cat/test/main.c +++ b/contrib/libarchive/cat/test/main.c @@ -520,7 +520,7 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) return (0); /* Standard: return 0 for end-of-string. */ cnt = utf8_count[ch]; - /* Invalide sequence or there are not plenty bytes. */ + /* Invalid sequence or there are not plenty bytes. */ if (n < (size_t)cnt) return (-1); @@ -559,7 +559,7 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) return (-1); } - /* The code point larger than 0x10FFFF is not leagal + /* The code point larger than 0x10FFFF is not legal * Unicode values. */ if (wc > 0x10FFFF) return (-1); |