utilize difftime() to subtract time to live

ImageMagick · Oct 14, 2023 · 5b91181 · 5b91181
1 parent 16e7c9f
commit 5b91181
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/magick/cache.c b/magick/cache.c
@@ -1854,7 +1854,7 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
     cpu_throttle = MagickResourceInfinity,
     cycles = 0;
 
-  if (((double) image->timestamp+image->ttl) < (double) GetMagickTime())
+  if (difftime(GetMagickTime(),image->timestamp) > (double) image->ttl)
     {
       cache_info=(CacheInfo *) image->cache;
       if (cache_info->file != -1)

diff --git a/magick/fx.c b/magick/fx.c
@@ -2163,7 +2163,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info,const ChannelType channel,
           FxParseConditional(subexpression,',',p,q);
           for (alpha=0.0; ; )
           {
-            if (((double) fx_info->images->timestamp+fx_info->images->ttl) < (double) GetMagickTime())
+            if (difftime(GetMagickTime(),fx_info->images->timestamp) > (double) fx_info->images->ttl)
               (void) ThrowMagickException(exception,GetMagickModule(),
                 ResourceLimitFatalError,"TimeLimitExceeded","`%s'",
                 fx_info->images->filename);
@@ -2238,7 +2238,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info,const ChannelType channel,
           FxParseConditional(subexpression,',',p,q);
           for (alpha=0.0; ; )
           {
-            if (((double) fx_info->images->timestamp+fx_info->images->ttl) < (double) GetMagickTime())
+            if (difftime(GetMagickTime(),fx_info->images->timestamp) > (double) fx_info->images->ttl)
               (void) ThrowMagickException(exception,GetMagickModule(),
                 ResourceLimitFatalError,"TimeLimitExceeded","`%s'",
                 fx_info->images->filename);
@@ -2620,7 +2620,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info,const ChannelType channel,
           FxParseConditional(subexpression,',',p,q);
           for (alpha=0.0; ; )
           {
-            if (((double) fx_info->images->timestamp+fx_info->images->ttl) < (double) GetMagickTime())
+            if (difftime(GetMagickTime(),fx_info->images->timestamp) > (double) fx_info->images->ttl)
               (void) ThrowMagickException(exception,GetMagickModule(),
                 ResourceLimitFatalError,"TimeLimitExceeded","`%s'",
                 fx_info->images->filename);

diff --git a/magick/timer.c b/magick/timer.c
@@ -329,7 +329,7 @@ MagickExport double GetElapsedTime(TimerInfo *time_info)
 MagickExport time_t GetMagickTime(void)
 {
   static time_t
-    constant_magick_time = (time_t) 0;
+    magick_epoch = (time_t) 0;
 
   static MagickBooleanType
     epoch_initialized = MagickFalse;
@@ -349,11 +349,11 @@ MagickExport time_t GetMagickTime(void)
           epoch=(time_t) CastDoubleToLong(StringToDouble(source_date_epoch,
             (char **) NULL));
           if ((epoch > 0) && (epoch <= time((time_t *) NULL)))
-            constant_magick_time=epoch;
+            magick_epoch=epoch;
         }
     }
-  if (constant_magick_time != 0)
-    return(constant_magick_time);
+  if (magick_epoch != 0)
+    return(magick_epoch);
   return(time((time_t *) NULL));
 }