summaryrefslogtreecommitdiff
path: root/ext/zip/lib/zip_extra_field_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/zip/lib/zip_extra_field_api.c')
-rw-r--r--ext/zip/lib/zip_extra_field_api.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/zip/lib/zip_extra_field_api.c b/ext/zip/lib/zip_extra_field_api.c
index 02ed4555e0..3e936d2664 100644
--- a/ext/zip/lib/zip_extra_field_api.c
+++ b/ext/zip/lib/zip_extra_field_api.c
@@ -46,6 +46,11 @@ zip_file_extra_field_delete(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id
_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1;
}
+
+ if (((flags & ZIP_EF_BOTH) == ZIP_EF_BOTH) && (ef_idx != ZIP_EXTRA_FIELD_ALL)) {
+ _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+ return -1;
+ }
if (_zip_get_dirent(za, idx, 0, NULL) == NULL)
return -1;
@@ -75,6 +80,11 @@ zip_file_extra_field_delete_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t
_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return -1;
}
+
+ if (((flags & ZIP_EF_BOTH) == ZIP_EF_BOTH) && (ef_idx != ZIP_EXTRA_FIELD_ALL)) {
+ _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+ return -1;
+ }
if (_zip_get_dirent(za, idx, 0, NULL) == NULL)
return -1;