Merge branch 'busybox' into merge

Conflicts:
	include/platform.h
	scripts/basic/fixdep.c

2 files changed, 14 insertions, 13 deletions

diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 32f842095..54d910431 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -115,7 +115,9 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                  */
                 p += len;
                 sz -= len;
-                if ((int)sz < 0
+                if (
+                /** (int)sz < 0 - not good enough for huge malicious VALUE of 2^32-1 */
+                    (int)(sz|len) < 0 /* this works */
                  || len == 0
                  || errno != EINVAL
                  || *end != ' '
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index c4e02f0f7..b11bf46af 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -184,27 +184,26 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected)
 
 int FAST_FUNC open_zipped(const char *fname)
 {
-        char *sfx;
         int fd;
 
         fd = open(fname, O_RDONLY);
         if (fd < 0)
                 return fd;
 
-        sfx = strrchr(fname, '.');
-        if (sfx) {
-                sfx++;
-                if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
-                        /* .lzma has no header/signature, just trust it */
+        if (ENABLE_FEATURE_SEAMLESS_LZMA) {
+                /* .lzma has no header/signature, can only detect it by extension */
+                char *sfx = strrchr(fname, '.');
+                if (sfx && strcmp(sfx+1, "lzma") == 0) {
                         open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma");
-                else
-                if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
-                 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
-                 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
-                ) {
-                        setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+                        return fd;
                 }
         }
+        if ((ENABLE_FEATURE_SEAMLESS_GZ)
+         || (ENABLE_FEATURE_SEAMLESS_BZ2)
+         || (ENABLE_FEATURE_SEAMLESS_XZ)
+        ) {
+                setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+        }
 
         return fd;
 }