Merge branch 'busybox' into merge

2 files changed, 6 insertions, 2 deletions

diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 0744f231a..fb5aac8fe 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -290,8 +290,11 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                 uint32_t pos;
 
                                 pos = buffer_pos - rep0;
-                                if ((int32_t)pos < 0)
+                                if ((int32_t)pos < 0) {
                                         pos += header.dict_size;
+                                        if ((int32_t)pos < 0)
+                                                goto bad;
+                                }
                                 match_byte = buffer[pos];
                                 do {
                                         int bit;
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 4ad174732..9ad0557c2 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -20,7 +20,7 @@ typedef struct hardlinks_t {
 char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
 {
         file_header_t *file_header = archive_handle->file_header;
-        char cpio_header[110];
+        char cpio_header[111];
         int namesize;
         int major, minor, nlink, mode, inode;
         unsigned size, uid, gid, mtime;
@@ -43,6 +43,7 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
                 bb_simple_error_msg_and_die("unsupported cpio format, use newc or crc");
         }
 
+        cpio_header[110] = '\0'; /* sscanf may call strlen which may break without this */
         if (sscanf(cpio_header + 6,
                         "%8x" "%8x" "%8x" "%8x"
                         "%8x" "%8x" "%8x" /*maj,min:*/ "%*16c"