Don't try to be smart about probing the min/max tim_t values.

Just assume that a signed time_t is really a 64-bit or 32-bit integer.

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index b5f8e30d6d6d6d1e0e232e650a9a7b7f42e554a6..3abe198503a5da21875da44254a62d59ade1ca10 100644 (file)
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -148,9 +148,12 @@ get_time_t_max(void)
                return (~(time_t)0);
        } else {
                /* Time_t is signed. */
-               const uintmax_t max_unsigned_time_t = (uintmax_t)(~(time_t)0);
-               const uintmax_t max_signed_time_t = max_unsigned_time_t >> 1;
-               return (time_t)max_signed_time_t;
+               /* Assume it's the same as int64_t or int32_t */
+               if (sizeof(time_t) == sizeof(int64_t)) {
+                       return (time_t)INT64_MAX;
+               } else {
+                       return (time_t)INT32_MAX;
+               }
        }
 #endif
 }
@@ -166,10 +169,11 @@ get_time_t_min(void)
                return (time_t)0;
        } else {
                /* Time_t is signed. */
-               const uintmax_t max_unsigned_time_t = (uintmax_t)(~(time_t)0);
-               const uintmax_t max_signed_time_t = max_unsigned_time_t >> 1;
-               const intmax_t min_signed_time_t = (intmax_t)~max_signed_time_t;
-               return (time_t)min_signed_time_t;
+               if (sizeof(time_t) == sizeof(int64_t)) {
+                       return (time_t)INT64_MIN;
+               } else {
+                       return (time_t)INT32_MIN;
+               }
        }
 #endif
 }
@@ -1561,7 +1565,7 @@ parse_keyword(struct archive_read *a, struct mtree *mtree,
                        int64_t m;
                        int64_t my_time_t_max = get_time_t_max();
                        int64_t my_time_t_min = get_time_t_min();
-                       long ns;
+                       long ns = 0;
 
                        *parsed_kws |= MTREE_HAS_MTIME;
                        m = mtree_atol10(&val);