Remove ZIP_CM_REPLACED_DEFAULT, use chagned flag ZIP_DIRENT_COMP_METHOD instead.

Author: dillof

lib/zip_close.c

@@ -326,7 +326,7 @@ static int add_data(zip_t *za, zip_source_t *src, zip_dirent_t *de) {
         st.comp_method = ZIP_CM_STORE;
     }
 
-    if (de->comp_method == ZIP_CM_REPLACED_DEFAULT && st.comp_method != ZIP_CM_STORE) {
+    if ((de->changed & ZIP_DIRENT_COMP_METHOD) == 0 && st.comp_method != ZIP_CM_STORE) {
         de->comp_method = st.comp_method;
     }
     else if (de->comp_method == ZIP_CM_STORE && (st.valid & ZIP_STAT_SIZE)) {
@@ -356,13 +356,14 @@ static int add_data(zip_t *za, zip_source_t *src, zip_dirent_t *de) {
     }
     else {
         de->uncomp_size = st.size;
-        /* this is technically incorrect (copy_source counts compressed data), but it's the best we have */
-        data_length = (zip_int64_t)st.size;
 
         if ((st.valid & ZIP_STAT_COMP_SIZE) == 0) {
             zip_uint64_t max_compressed_size;
             zip_uint16_t compression_method = ZIP_CM_ACTUAL(de->comp_method);
 
+            /* this is technically incorrect (copy_source counts compressed data), but it's the best we have */
+            data_length = (zip_int64_t)st.size;
+
             if (compression_method == ZIP_CM_STORE) {
                 max_compressed_size = st.size;
             }

lib/zip_file_replace.c

@@ -93,18 +93,6 @@ _zip_file_replace(zip_t *za, zip_uint64_t idx, const char *name, zip_source_t *s
      * needed for a double add of the same file name */
     _zip_unchange_data(za->entry + idx);
 
-    if (za->entry[idx].orig != NULL && (za->entry[idx].changes == NULL || (za->entry[idx].changes->changed & ZIP_DIRENT_COMP_METHOD) == 0)) {
-        if (za->entry[idx].changes == NULL) {
-            if ((za->entry[idx].changes = _zip_dirent_clone(za->entry[idx].orig)) == NULL) {
-                zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
-                return -1;
-            }
-        }
-
-        za->entry[idx].changes->comp_method = ZIP_CM_REPLACED_DEFAULT;
-        za->entry[idx].changes->changed |= ZIP_DIRENT_COMP_METHOD;
-    }
-
     za->entry[idx].source = source;
 
     return (zip_int64_t)idx;

lib/zip_source_compress.c

@@ -161,7 +161,7 @@ static struct context *context_new(zip_int32_t method, bool compress, zip_uint32
         return NULL;
     }
     zip_error_init(&ctx->error);
-    ctx->can_store = compress ? ZIP_CM_IS_DEFAULT(method) : false;
+    ctx->can_store = compress ? method == ZIP_CM_DEFAULT : false;
     ctx->algorithm = algorithm;
     ctx->method = method;
     ctx->compress = compress;

lib/zip_stat_index.c

@@ -58,7 +58,7 @@ zip_stat_index(zip_t *za, zip_uint64_t index, zip_flags_t flags, zip_stat_t *st)
             return -1;
         }
 
-        if (ZIP_CM_IS_DEFAULT(de->comp_method)) {
+        if (de->comp_method == ZIP_CM_DEFAULT) {
             if (!(st->valid & ZIP_STAT_COMP_METHOD) || st->comp_method == ZIP_CM_STORE) {
                 st->valid &= ~(ZIP_STAT_COMP_SIZE|ZIP_STAT_COMP_METHOD);
             }

lib/zip_unchange_data.c

@@ -41,13 +41,5 @@ _zip_unchange_data(zip_entry_t *ze) {
         ze->source = NULL;
     }
 
-    if (ze->changes != NULL && (ze->changes->changed & ZIP_DIRENT_COMP_METHOD) && ze->changes->comp_method == ZIP_CM_REPLACED_DEFAULT) {
-        ze->changes->changed &= ~ZIP_DIRENT_COMP_METHOD;
-        if (ze->changes->changed == 0) {
-            _zip_dirent_free(ze->changes);
-            ze->changes = NULL;
-        }
-    }
-
     ze->deleted = 0;
 }

lib/zipint.h

@@ -78,7 +78,6 @@
 
 #define ZIP_CRYPTO_PKWARE_HEADERLEN 12
 
-#define ZIP_CM_REPLACED_DEFAULT (-2)
 #define ZIP_CM_WINZIP_AES 99 /* Winzip AES encrypted */
 
 #define WINZIP_AES_PASSWORD_VERIFY_LENGTH 2
@@ -87,8 +86,7 @@
 #define HMAC_LENGTH 10
 #define SALT_LENGTH(method) ((method) == ZIP_EM_AES_128 ? 8 : ((method) == ZIP_EM_AES_192 ? 12 : 16))
 
-#define ZIP_CM_IS_DEFAULT(x) ((x) == ZIP_CM_DEFAULT || (x) == ZIP_CM_REPLACED_DEFAULT)
-#define ZIP_CM_ACTUAL(x) ((zip_uint16_t)(ZIP_CM_IS_DEFAULT(x) ? ZIP_CM_DEFLATE : (x)))
+#define ZIP_CM_ACTUAL(x) ((zip_uint16_t)((x) == ZIP_CM_DEFAULT ? ZIP_CM_DEFLATE : (x)))
 
 #define ZIP_EF_UTF_8_COMMENT 0x6375
 #define ZIP_EF_UTF_8_NAME 0x7075