time-to-live returned incorrect results when SOURCE_DATE_EPOCH set (#278

)
ImageMagick · Oct 11, 2023 · eb9ac36 · eb9ac36
1 parent 7100cc9
commit eb9ac36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/magick/cache.c b/magick/cache.c
@@ -1859,7 +1859,7 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
     cpu_throttle=GetMagickResourceLimit(ThrottleResource);
   if ((cycles++ % 4096) == 0)
     {
-      if (GetMagickTTL() < 0)
+      if (GetMagickTTL() <= 0)
         {
           cache_info=(CacheInfo *) image->cache;
           if (cache_info->file != -1)

diff --git a/magick/timer.c b/magick/timer.c
@@ -346,7 +346,8 @@ MagickExport time_t GetMagickTime(void)
           time_t
             epoch;
 
-          epoch=(time_t) StringToDouble(source_date_epoch,(char **) NULL);
+          epoch=(time_t) CastDoubleToLong(StringToDouble(source_date_epoch,
+            (char **) NULL));
           if ((epoch > 0) && (epoch <= time((time_t *) NULL)))
             constant_magick_time=epoch;
         }
@@ -388,7 +389,7 @@ MagickPrivate MagickOffsetType GetMagickTTL(void)
       magick_epoch=time((time_t *) NULL);
     }
   return((MagickOffsetType) GetMagickResourceLimit(TimeResource)-
-    (GetMagickTime()-magick_epoch));
+    (time((time_t *) NULL)-magick_epoch));
 }
 
 /*