From: Christian Franke <Christian.Franke@t-online.de>
To: cygwin-apps@cygwin.com
Subject: [PATCH rebase] peflags: Fix ULONG range checks
Date: Mon, 7 Aug 2023 16:07:45 +0200 [thread overview]
Message-ID: <e9bdc5e5-f8b6-c8f4-3548-625c402a326f@t-online.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 101 bytes --]
Minor issue found during tests of the upcoming 'peflags --timestamp' patch.
--
Regards,
Christian
[-- Attachment #2: 0001-peflags-Fix-ULONG-range-checks.patch --]
[-- Type: text/plain, Size: 1542 bytes --]
From 9da405da78e92dc8263239e25365bee3167f185e Mon Sep 17 00:00:00 2001
From: Christian Franke <christian.franke@t-online.de>
Date: Mon, 7 Aug 2023 13:42:50 +0200
Subject: [PATCH] peflags: Fix ULONG range checks
Don't use ULONG_MAX from <limits.h> because ULONG is not necessarily
'unsigned long'.
Signed-off-by: Christian Franke <christian.franke@t-online.de>
---
peflags.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/peflags.c b/peflags.c
index 93eaa0b..d98b121 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
@@ -598,7 +597,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 > 0x00000000ffffffffULL))
{
fprintf (stderr, "Invalid argument for %s: %s\n",
option_name, option_arg);
@@ -960,7 +959,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 > 0x00000000ffffffffULL)
{
fprintf (stderr, "%s: Skip writing %s, value too big\n",
pep->pathname, val->name);
--
2.39.0
next reply other threads:[~2023-08-07 14:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 14:07 Christian Franke [this message]
2023-08-07 18:50 ` Corinna Vinschen
2023-08-08 8:06 ` Christian Franke
2023-08-08 8:37 ` Corinna Vinschen
2023-08-08 8:40 ` Christian Franke
2023-08-08 8:55 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9bdc5e5-f8b6-c8f4-3548-625c402a326f@t-online.de \
--to=christian.franke@t-online.de \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).