@@ -649,13 +649,12 @@ static int SendText(char *RPath, const char *Subject, const char *mailTo, const
649649 return (SUCCESS );
650650}
651651
652- static int addToHeader (char * * header_buffer , const char * specifier , const char * string )
652+ static void addToHeader (char * * header_buffer , const char * specifier , const char * string )
653653{
654654 size_t header_buffer_size = strlen (* header_buffer );
655655 size_t total_size = header_buffer_size + strlen (specifier ) + strlen (string ) + 1 ;
656656 * header_buffer = erealloc (* header_buffer , total_size );
657657 snprintf (* header_buffer + header_buffer_size , total_size - header_buffer_size , specifier , string );
658- return 1 ;
659658}
660659
661660//*********************************************************************
@@ -701,24 +700,16 @@ static int PostHeader(char *RPath, const char *Subject, const char *mailTo, char
701700 }
702701
703702 if (!headers_lc || !strstr (headers_lc , "from:" )) {
704- if (!addToHeader (& header_buffer , "From: %s\r\n" , RPath )) {
705- goto PostHeader_outofmem ;
706- }
707- }
708- if (!addToHeader (& header_buffer , "Subject: %s\r\n" , Subject )) {
709- goto PostHeader_outofmem ;
703+ addToHeader (& header_buffer , "From: %s\r\n" , RPath );
710704 }
705+ addToHeader (& header_buffer , "Subject: %s\r\n" , Subject );
711706
712707 /* Only add the To: field from the $to parameter if isn't in the custom headers */
713708 if ((headers_lc && (!strstr (headers_lc , "\r\nto:" ) && (strncmp (headers_lc , "to:" , 3 ) != 0 ))) || !headers_lc ) {
714- if (!addToHeader (& header_buffer , "To: %s\r\n" , mailTo )) {
715- goto PostHeader_outofmem ;
716- }
709+ addToHeader (& header_buffer , "To: %s\r\n" , mailTo );
717710 }
718711 if (xheaders ) {
719- if (!addToHeader (& header_buffer , "%s\r\n" , xheaders )) {
720- goto PostHeader_outofmem ;
721- }
712+ addToHeader (& header_buffer , "%s\r\n" , xheaders );
722713 }
723714
724715 if (headers_lc ) {
@@ -735,12 +726,6 @@ static int PostHeader(char *RPath, const char *Subject, const char *mailTo, char
735726 }
736727
737728 return (SUCCESS );
738-
739- PostHeader_outofmem :
740- if (headers_lc ) {
741- efree (headers_lc );
742- }
743- return OUT_OF_MEMORY ;
744729}
745730
746731
0 commit comments