fix "Re:" not removed from empty subjects

issue found by Nicholas Boel
cnb · May 8, 2024 · bd10265 · bd10265
1 parent 0896df5
commit bd10265
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/nntpserv.c b/src/nntpserv.c
@@ -2305,8 +2305,11 @@ void command_post(struct var *var)
 
    /* Strip Re: */
 
-   if(!cfg_nostripre && (strncmp(subject,"Re: ",4)==0 || strcmp(subject,"Re:")==0))
-      memmove(subject,subject+4,strlen(subject)-3);
+   if(!cfg_nostripre)
+   {
+      if(strncmp(subject,"Re: ",4)==0)   memmove(subject,subject+4,strlen(subject)-3);
+      else if(strcmp(subject,"Re:")==0)  subject[0]=0;
+   }
 
    /* Truncate strings */
 

diff --git a/src/nntpserv.h b/src/nntpserv.h
@@ -72,7 +72,7 @@ struct var
 #define CRLF CR LF
 
 #define SERVER_NAME       "JamNNTPd/" PLATFORM_NAME
-#define SERVER_VERSION    "1.4-c beta 3"
+#define SERVER_VERSION    "1.4-c beta 4"
 #define SERVER_PIDVERSION SERVER_VERSION
 
 #define SOCKIO_TIMEOUT 5*60