Imported Upstream version 1.3.0

[platform/upstream/libzip.git] / lib / zip_source_window.c

diff --git a/lib/zip_source_window.c b/lib/zip_source_window.c
index f02d048..ec0c8b4 100644 (file)
--- a/lib/zip_source_window.c
+++ b/lib/zip_source_window.c
@@ -17,7 +17,7 @@
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.

- 
+

   THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE


@@ -38,10 +38,17 @@
 #include "zipint.h"
 
 struct window {
 #include "zipint.h"
 
 struct window {

-    zip_uint64_t start;
-    zip_uint64_t end;
-    zip_uint64_t offset;
+    zip_uint64_t start;                        /* where in file we start reading */
+    zip_uint64_t end;                  /* where in file we stop reading */
+
+    /* if not NULL, read file data for this file */
+    zip_t *source_archive;
+    zip_uint64_t source_index;
+
+    zip_uint64_t offset;               /* offset in src for next read */
+

     zip_stat_t stat;
     zip_stat_t stat;

+    zip_int8_t compression_flags;

     zip_error_t error;
     zip_int64_t supports;
     bool needs_seek;
     zip_error_t error;
     zip_int64_t supports;
     bool needs_seek;


@@ -53,39 +60,42 @@ static zip_int64_t window_read(zip_source_t *, void *, void *, zip_uint64_t, zip
 zip_source_t *
 zip_source_window(zip_t *za, zip_source_t *src, zip_uint64_t start, zip_uint64_t len)
 {
 zip_source_t *
 zip_source_window(zip_t *za, zip_source_t *src, zip_uint64_t start, zip_uint64_t len)
 {

-    return _zip_source_window_new(src, start, len, NULL, &za->error);
+    return _zip_source_window_new(src, start, len, NULL, 0, NULL, 0, &za->error);

 }
 
 
 zip_source_t *
 }
 
 
 zip_source_t *

-_zip_source_window_new(zip_source_t *src, zip_uint64_t start, zip_uint64_t length, zip_stat_t *st, zip_error_t *error)
+_zip_source_window_new(zip_source_t *src, zip_uint64_t start, zip_uint64_t length, zip_stat_t *st, zip_int8_t compression_flags, zip_t *source_archive, zip_uint64_t source_index, zip_error_t *error)

 {
     struct window *ctx;
 {
     struct window *ctx;

-    
-    if (src == NULL || start + length < start) {
+
+    if (src == NULL || start + length < start || (source_archive == NULL && source_index != 0)) {

         zip_error_set(error, ZIP_ER_INVAL, 0);
         return NULL;
     }
         zip_error_set(error, ZIP_ER_INVAL, 0);
         return NULL;
     }

-    
+

     if ((ctx=(struct window *)malloc(sizeof(*ctx))) == NULL) {
         zip_error_set(error, ZIP_ER_MEMORY, 0);
         return NULL;
     }
     if ((ctx=(struct window *)malloc(sizeof(*ctx))) == NULL) {
         zip_error_set(error, ZIP_ER_MEMORY, 0);
         return NULL;
     }

-    
+

     ctx->start = start;
     ctx->end = start + length;
     zip_stat_init(&ctx->stat);
     ctx->start = start;
     ctx->end = start + length;
     zip_stat_init(&ctx->stat);

+    ctx->compression_flags = compression_flags;
+    ctx->source_archive = source_archive;
+    ctx->source_index = source_index;

     zip_error_init(&ctx->error);
     zip_error_init(&ctx->error);

-    ctx->supports = (zip_source_supports(src) & ZIP_SOURCE_SUPPORTS_SEEKABLE) | (zip_source_make_command_bitmap(ZIP_SOURCE_SUPPORTS, ZIP_SOURCE_TELL, -1));
+    ctx->supports = (zip_source_supports(src) & ZIP_SOURCE_SUPPORTS_SEEKABLE) | (zip_source_make_command_bitmap(ZIP_SOURCE_GET_COMPRESSION_FLAGS, ZIP_SOURCE_SUPPORTS, ZIP_SOURCE_TELL, -1));

     ctx->needs_seek = (ctx->supports & ZIP_SOURCE_MAKE_COMMAND_BITMASK(ZIP_SOURCE_SEEK)) ? true : false;
     ctx->needs_seek = (ctx->supports & ZIP_SOURCE_MAKE_COMMAND_BITMASK(ZIP_SOURCE_SEEK)) ? true : false;

-    
+

     if (st) {
         if (_zip_stat_merge(&ctx->stat, st, error) < 0) {
             free(ctx);
             return NULL;
         }
     }
     if (st) {
         if (_zip_stat_merge(&ctx->stat, st, error) < 0) {
             free(ctx);
             return NULL;
         }
     }

-    
+

     return zip_source_layered_create(src, window_read, ctx, error);
 }
 
     return zip_source_layered_create(src, window_read, ctx, error);
 }
 


@@ -123,15 +133,31 @@ window_read(zip_source_t *src, void *_ctx, void *data, zip_uint64_t len, zip_sou
     switch (cmd) {
         case ZIP_SOURCE_CLOSE:
             return 0;
     switch (cmd) {
         case ZIP_SOURCE_CLOSE:
             return 0;

-            
+

         case ZIP_SOURCE_ERROR:
             return zip_error_to_data(&ctx->error, data, len);
         case ZIP_SOURCE_ERROR:
             return zip_error_to_data(&ctx->error, data, len);

-            
+

         case ZIP_SOURCE_FREE:
             free(ctx);
             return 0;
 
         case ZIP_SOURCE_OPEN:
         case ZIP_SOURCE_FREE:
             free(ctx);
             return 0;
 
         case ZIP_SOURCE_OPEN:

+           if (ctx->source_archive) {
+               zip_int64_t offset;
+
+               if ((offset = _zip_file_get_offset(ctx->source_archive, ctx->source_index, &ctx->error)) == 0) {
+                   return -1;
+               }
+               if (ctx->end + offset < ctx->end) {
+                   /* zip archive data claims end of data past zip64 limits */
+                   zip_error_set(&ctx->error, ZIP_ER_INCONS, 0);
+                   return -1;
+               }
+               ctx->start += offset;
+               ctx->end += offset;
+               ctx->source_archive = NULL;
+           }
+

             if (!ctx->needs_seek) {
                 for (n=0; n<ctx->start; n+=(zip_uint64_t)ret) {
                     i = (ctx->start-n > sizeof(b) ? sizeof(b) : ctx->start-n);
             if (!ctx->needs_seek) {
                 for (n=0; n<ctx->start; n+=(zip_uint64_t)ret) {
                     i = (ctx->start-n > sizeof(b) ? sizeof(b) : ctx->start-n);


@@ -144,7 +170,7 @@ window_read(zip_source_t *src, void *_ctx, void *data, zip_uint64_t len, zip_sou
                         return -1;
                     }
                 }
                         return -1;
                     }
                 }

-               
+

             }
            ctx->offset = ctx->start;
             return 0;
             }
            ctx->offset = ctx->start;
             return 0;


@@ -152,17 +178,17 @@ window_read(zip_source_t *src, void *_ctx, void *data, zip_uint64_t len, zip_sou
         case ZIP_SOURCE_READ:
             if (len > ctx->end - ctx->offset)
                 len = ctx->end - ctx->offset;
         case ZIP_SOURCE_READ:
             if (len > ctx->end - ctx->offset)
                 len = ctx->end - ctx->offset;

-            
+

             if (len == 0)
                 return 0;
             if (len == 0)
                 return 0;

-            
+

             if (ctx->needs_seek) {
                 if (zip_source_seek(src, (zip_int64_t)ctx->offset, SEEK_SET) < 0) {
                     _zip_error_set_from_source(&ctx->error, src);
                     return -1;
                 }
             }
             if (ctx->needs_seek) {
                 if (zip_source_seek(src, (zip_int64_t)ctx->offset, SEEK_SET) < 0) {
                     _zip_error_set_from_source(&ctx->error, src);
                     return -1;
                 }
             }

-            
+

             if ((ret=zip_source_read(src, data, len)) < 0) {
                 zip_error_set(&ctx->error, ZIP_ER_EOF, 0);
                 return -1;
             if ((ret=zip_source_read(src, data, len)) < 0) {
                 zip_error_set(&ctx->error, ZIP_ER_EOF, 0);
                 return -1;


@@ -177,7 +203,7 @@ window_read(zip_source_t *src, void *_ctx, void *data, zip_uint64_t len, zip_sou
                 }
             }
             return ret;
                 }
             }
             return ret;

-            
+

         case ZIP_SOURCE_SEEK:
         {
             zip_int64_t new_offset = zip_source_seek_compute_offset(ctx->offset - ctx->start, ctx->end - ctx->start, data, len, &ctx->error);
         case ZIP_SOURCE_SEEK:
         {
             zip_int64_t new_offset = zip_source_seek_compute_offset(ctx->offset - ctx->start, ctx->end - ctx->start, data, len, &ctx->error);


@@ -185,7 +211,7 @@ window_read(zip_source_t *src, void *_ctx, void *data, zip_uint64_t len, zip_sou
             if (new_offset < 0) {
                 return -1;
             }
             if (new_offset < 0) {
                 return -1;
             }

-            
+

             ctx->offset = (zip_uint64_t)new_offset + ctx->start;
             return 0;
         }
             ctx->offset = (zip_uint64_t)new_offset + ctx->start;
             return 0;
         }


@@ -193,21 +219,24 @@ window_read(zip_source_t *src, void *_ctx, void *data, zip_uint64_t len, zip_sou
        case ZIP_SOURCE_STAT:
         {
             zip_stat_t *st;
        case ZIP_SOURCE_STAT:
         {
             zip_stat_t *st;

-            
+

            st = (zip_stat_t *)data;
            st = (zip_stat_t *)data;

-            
+

             if (_zip_stat_merge(st, &ctx->stat, &ctx->error) < 0) {
                 return -1;
             }
             return 0;
         }
             if (_zip_stat_merge(st, &ctx->stat, &ctx->error) < 0) {
                 return -1;
             }
             return 0;
         }

-            
+
+        case ZIP_SOURCE_GET_COMPRESSION_FLAGS:
+           return ctx->compression_flags;
+

         case ZIP_SOURCE_SUPPORTS:
             return ctx->supports;
         case ZIP_SOURCE_SUPPORTS:
             return ctx->supports;

-            
+

         case ZIP_SOURCE_TELL:
             return (zip_int64_t)(ctx->offset - ctx->start);
         case ZIP_SOURCE_TELL:
             return (zip_int64_t)(ctx->offset - ctx->start);

-            
+

        default:
             zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0);
             return -1;
        default:
             zip_error_set(&ctx->error, ZIP_ER_OPNOTSUPP, 0);
             return -1;


@@ -219,7 +248,7 @@ void
 _zip_deregister_source(zip_t *za, zip_source_t *src)
 {
     unsigned int i;
 _zip_deregister_source(zip_t *za, zip_source_t *src)
 {
     unsigned int i;

-    
+

     for (i=0; i<za->nopen_source; i++) {
         if (za->open_source[i] == src) {
             za->open_source[i] = za->open_source[za->nopen_source-1];
     for (i=0; i<za->nopen_source; i++) {
         if (za->open_source[i] == src) {
             za->open_source[i] = za->open_source[za->nopen_source-1];


@@ -234,7 +263,7 @@ int
 _zip_register_source(zip_t *za, zip_source_t *src)
 {
     zip_source_t **open_source;
 _zip_register_source(zip_t *za, zip_source_t *src)
 {
     zip_source_t **open_source;

-    
+

     if (za->nopen_source+1 >= za->nopen_source_alloc) {
         unsigned int n;
         n = za->nopen_source_alloc + 10;
     if (za->nopen_source+1 >= za->nopen_source_alloc) {
         unsigned int n;
         n = za->nopen_source_alloc + 10;


@@ -246,8 +275,8 @@ _zip_register_source(zip_t *za, zip_source_t *src)
         za->nopen_source_alloc = n;
         za->open_source = open_source;
     }
         za->nopen_source_alloc = n;
         za->open_source = open_source;
     }

-    
+

     za->open_source[za->nopen_source++] = src;
     za->open_source[za->nopen_source++] = src;

-    
+

     return 0;
 }
     return 0;
 }