Skip to content

Commit 8cff225

Browse files
committed
win32/sendmail.c/SendText(): mark RPath argument as _In_
As we always pass it a non-NULL char* pointer. Also remove conditional check that is always true
1 parent b51c2cd commit 8cff225

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

win32/sendmail.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static const char *ErrorMessages[] =
112112
#define PHP_WIN32_MAIL_DOT_PATTERN "\n."
113113
#define PHP_WIN32_MAIL_DOT_REPLACE "\n.."
114114

115-
static int SendText(_In_ const char *host, const char *RPath, const char *Subject, const char *mailTo, const char *data,
115+
static int SendText(_In_ const char *host, _In_ const char *RPath, const char *Subject, const char *mailTo, const char *data,
116116
zend_string *headers, zend_string *headers_lc, char **error_message);
117117
static int MailConnect(_In_ const char *host);
118118
static bool PostHeader(const char *RPath, const char *Subject, const char *mailTo, zend_string *xheaders);
@@ -258,9 +258,8 @@ PHPAPI int TSendMail(const char *host, int *error, char **error_message,
258258

259259
ret = SendText(host, RPath, Subject, mailTo, data, headers_trim, headers_lc, error_message);
260260
TSMClose();
261-
if (RPath) {
262-
efree(RPath);
263-
}
261+
efree(RPath);
262+
264263
if (headers) {
265264
zend_string_release(headers_trim);
266265
zend_string_release(headers_lc);
@@ -363,7 +362,7 @@ static char *find_address(char *list, char **state)
363362
// Author/Date: jcar 20/9/96
364363
// History:
365364
//*********************************************************************
366-
static int SendText(_In_ const char *host, const char *RPath, const char *Subject, const char *mailTo, const char *data,
365+
static int SendText(_In_ const char *host, _In_ const char *RPath, const char *Subject, const char *mailTo, const char *data,
367366
zend_string *headers, zend_string *headers_lc, char **error_message)
368367
{
369368
int res;
@@ -379,8 +378,6 @@ static int SendText(_In_ const char *host, const char *RPath, const char *Subjec
379378
return (BAD_MSG_CONTENTS);
380379
if (mailTo == NULL)
381380
return (BAD_MSG_DESTINATION);
382-
if (RPath == NULL)
383-
return (BAD_MSG_RPATH);
384381

385382
/* simple checks for the mailto address */
386383
/* have ampersand ? */

0 commit comments

Comments
 (0)