[rebase - The rebase tool, core of the automatic rebase facility during postinstall] branch master, updated. fa4229d7099fbf14e83125fed142c03638574d50

[rebase - The rebase tool, core of the automatic rebase facility during postinstall] branch master, updated. fa4229d7099fbf14e83125fed142c03638574d50

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/rebase.git;h=fa4229d7099fbf14e83125fed142c03638574d50

commit fa4229d7099fbf14e83125fed142c03638574d50
Author: Christian Franke <christian.franke@t-online.de>
Date:   Tue Aug 8 09:58:39 2023 +0200

    peflags: Fix ULONG range checks
    
    Don't use ULONG_MAX from <limits.h> because ULONG is not necessarily
    'unsigned long'.  Use MAXULONG32 instead.
    
    Signed-off-by: Christian Franke <christian.franke@t-online.de>


Diff:
---
 peflags.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/peflags.c b/peflags.c
index f215704dff31..1a61da714d73 100644
--- a/peflags.c
+++ b/peflags.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
-#include <limits.h>
 #if defined (__CYGWIN__) || defined (__MSYS__)
 #include <sys/mman.h>
 #endif
@@ -696,7 +695,7 @@ handle_num_option (const char *option_name,
 	   || sizeof_vals[option_index].value > 0x0000ffffffffffffULL
 	   /* Just a ULONG value */
 	   || (sizeof_vals[option_index].is_ulong
-	       && sizeof_vals[option_index].value > ULONG_MAX))
+	       && sizeof_vals[option_index].value > MAXULONG32))
     {
       fprintf (stderr, "Invalid argument for %s: %s\n", 
 	       option_name, option_arg);
@@ -1092,7 +1091,7 @@ get_and_set_size (const pe_file *pep, sizeof_values_t *val)
     }
   else if (val->handle == DO_WRITE)
     {
-      if ((!pep->is_64bit || val->is_ulong) && val->value >= ULONG_MAX)
+      if ((!pep->is_64bit || val->is_ulong) && val->value > MAXULONG32)
 	{
 	  fprintf (stderr, "%s: Skip writing %s, value too big\n",
 		   pep->pathname, val->name);