commit 171adcaba27ff346473ca161356c76e8cf93fc9e
author Antonin Décimo <antonin.decimo@gmail.com> Fri Jun 05 14:07:32 2020 +0200
committer Antonin Décimo <antonin.decimo@gmail.com> Fri Jun 05 14:39:27 2020 +0200
tree 3f7ae1d4e76a31cde89ec2ced6f3698a3139921c
parent 7da8ac3b29e60d28c7b5405a0aeaee6ff57eb3ea

Cast operands instead of result to prevent overflow

lib/zip_dirent.c

diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
index 91ff3c2..1691071 100644
--- a/lib/zip_dirent.c
+++ b/lib/zip_dirent.c
@@ -596,7 +596,7 @@
 
     zde->extra_fields = _zip_ef_remove_internal(zde->extra_fields);
 
-    return (zip_int64_t)(size + variable_size);
+    return (zip_int64_t)size + (zip_int64_t)variable_size;
 }
 
 

lib/zip_string.c

diff --git a/lib/zip_string.c b/lib/zip_string.c
index a6edbc5..374bc3f 100644
--- a/lib/zip_string.c
+++ b/lib/zip_string.c
@@ -145,7 +145,7 @@
 	return NULL;
     }
 
-    if ((s->raw = (zip_uint8_t *)malloc((size_t)(length + 1))) == NULL) {
+    if ((s->raw = (zip_uint8_t *)malloc((size_t)length + 1)) == NULL) {
 	free(s);
 	return NULL;
     }