diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-15 13:07:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-15 13:08:20 (GMT) |
| commit | 6ab7c326485b4af46a4e45faef2ac7d469df8840 (patch) | |
| tree | f41bf6216150908e28eb4eb11e8f8c04642b1fef | |
| parent | 5a58efaac3557b0cee27f06e49183069cd598a7f (diff) | |
| download | CMake-6ab7c326485b4af46a4e45faef2ac7d469df8840.zip CMake-6ab7c326485b4af46a4e45faef2ac7d469df8840.tar.gz CMake-6ab7c326485b4af46a4e45faef2ac7d469df8840.tar.bz2 | |
libarchive: Avoid left-shift overflow of signed integer
In libarchive/archive_write_set_format_zip.c there are two calls to
archive_le32enc whose second argument is of the form
archive_entry_mode(zip->entry) << 16
However, the return type from archive_entry_mode may be a signed integer
so the shift may overflow. Since the second argument of archive_le32enc
expects uint32_t anyway, simply cast to that prior to shifting.
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c index d856b2a..157f100 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c @@ -621,7 +621,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry) archive_le16enc(zip->file_header + 28, filename_length); /* Following Info-Zip, store mode in the "external attributes" field. */ archive_le32enc(zip->file_header + 38, - archive_entry_mode(zip->entry) << 16); + ((uint32_t)archive_entry_mode(zip->entry)) << 16); e = cd_alloc(zip, filename_length); /* If (e == NULL) XXXX */ copy_path(zip->entry, e); @@ -714,7 +714,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry) } if (included & 4) { archive_le32enc(e, /* external file attributes */ - archive_entry_mode(zip->entry) << 16); + ((uint32_t)archive_entry_mode(zip->entry)) << 16); e += 4; } if (included & 8) { |