22ed1491e1
- update to 2.13: * CVE-2015-1197, CVE-2016-2037, CVE-2019-14866 - remove patches (upstream): cpio-2.12-out_of_bounds_write.patch, cpio-2.12-CVE-2019-14866.patch, cpio-2.12-util.c_no_return_in_nonvoid_fnc.patch, cpio-check_for_symlinks.patch OBS-URL: https://build.opensuse.org/request/show/826878 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=81
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
Index: src/copyin.c
|
|
===================================================================
|
|
--- src/copyin.c.orig
|
|
+++ src/copyin.c
|
|
@@ -1123,15 +1123,15 @@ read_in_binary (struct cpio_file_stat *f
|
|
swab_array ((char *) short_hdr, 13);
|
|
}
|
|
|
|
- file_hdr->c_dev_maj = major (short_hdr->c_dev);
|
|
- file_hdr->c_dev_min = minor (short_hdr->c_dev);
|
|
+ file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev);
|
|
+ file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev);
|
|
file_hdr->c_ino = short_hdr->c_ino;
|
|
file_hdr->c_mode = short_hdr->c_mode;
|
|
file_hdr->c_uid = short_hdr->c_uid;
|
|
file_hdr->c_gid = short_hdr->c_gid;
|
|
file_hdr->c_nlink = short_hdr->c_nlink;
|
|
- file_hdr->c_rdev_maj = major (short_hdr->c_rdev);
|
|
- file_hdr->c_rdev_min = minor (short_hdr->c_rdev);
|
|
+ file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev);
|
|
+ file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev);
|
|
file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16
|
|
| short_hdr->c_mtimes[1];
|
|
file_hdr->c_filesize = (unsigned long) short_hdr->c_filesizes[0] << 16
|