From 3b7d4567e7a96b759e51a4fad879bd34390f656b Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Windows 11)" <rob@synchro.net>
Date: Tue, 4 Feb 2025 21:25:06 -0800
Subject: [PATCH] Don't MSVC warning suppression
---
src/sbbs3/mailsrvr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 023b1f3754..940e19603c 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -964,7 +964,7 @@ static ulong sockmsgtxt(SOCKET socket, const char* prot, CRYPT_SESSION sess, smb
/* filename(s) in subject */
char* p = msg->subj;
SKIP_WHITESPACE(p);
- while (*p != '\0') {
+ while (p != NULL && *p != '\0') {
char delim = ' ';
if (*p == '"') {
delim = '"';
@@ -1228,7 +1228,7 @@ static bool pop3_client_thread(pop3_t* pop3)
password[0] = 0;
srand((unsigned int)(time(NULL) ^ (time_t)GetCurrentThreadId())); /* seed random number generator */
- rand(); /* throw-away first result */
+ (void)rand(); /* throw-away first result */
safe_snprintf(challenge, sizeof(challenge), "<%x%x%lx%lx@%.128s>"
, rand(), socket, (ulong)time(NULL), (ulong)clock(), server_host_name());
@@ -2456,7 +2456,7 @@ js_mailproc(SOCKET sock, client_t* client, user_t* user, struct mailproc* mailpr
p = cmdline;
FIND_WHITESPACE(p);
SKIP_WHITESPACE(p);
- for (argc = 0; *p; argc++) {
+ for (argc = 0; p != NULL && *p != '\0'; argc++) {
SAFECOPY(arg, p);
truncstr(arg, " \t");
val = STRING_TO_JSVAL(JS_NewStringCopyZ(*js_cx, arg));
@@ -3139,7 +3139,7 @@ static bool smtp_client_thread(smtp_t* smtp)
spam.subnum = INVALID_SUB;
srand((unsigned int)(time(NULL) ^ (time_t)GetCurrentThreadId())); /* seed random number generator */
- rand(); /* throw-away first result */
+ (void)rand(); /* throw-away first result */
SAFEPRINTF4(session_id, "%x%x%x%lx", getpid(), socket, rand(), (long)clock());
lprintf(LOG_DEBUG, "%04d %s [%s] Session ID=%s", socket, client.protocol, host_ip, session_id);
SAFEPRINTF3(msgtxt_fname, "%sSBBS_%s.%s.msg", scfg.temp_dir, client.protocol, session_id);
--
GitLab