From 0454875168679c2685d654c75bc3728da2da422d Mon Sep 17 00:00:00 2001 From: kientzle Date: Tue, 15 Jan 2008 04:56:48 +0000 Subject: Support uppercase hex digits in cpio archives. Thanks to: Joshua Kwan MFC after: 7 days --- lib/libarchive/archive_read_support_format_cpio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c index 5034764..5cb5fe6 100644 --- a/lib/libarchive/archive_read_support_format_cpio.c +++ b/lib/libarchive/archive_read_support_format_cpio.c @@ -321,10 +321,12 @@ static int is_hex(const char *p, size_t len) { while (len-- > 0) { - if (*p < '0' || (*p > '9' && *p < 'a') || *p > 'f') { + if ((*p >= '0' && *p <= '9') + || (*p >= 'a' && *p <= 'f') + || (*p >= 'A' && *p <= 'F')) + ++p; + else return (0); - } - ++p; } return (1); } -- cgit v1.1