luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libssh2: make atime/mtime date overflow return error

Browse Source 
Closes #9328
This commit is contained in:
Daniel Stenberg 2022-08-17 10:51:42 +02:00
parent c988ec9f41
commit f3c013d38c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/vssh/libssh2.c
View File

@ -1755,47 +1755,36 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
break;
}
}
else if(strncasecompare(cmd, "atime", 5)) {
else if(strncasecompare(cmd, "atime", 5) ||
strncasecompare(cmd, "mtime", 5)) {
time_t date = Curl_getdate_capped(sshc->quote_path1);
bool fail = FALSE;
if(date == -1) {
failf(data, "incorrect date format for %.*s", 5, cmd);
fail = TRUE;
}
#if SIZEOF_TIME_T > SIZEOF_LONG
if(date > 0xffffffff) {
/* if 'long' can't old >32bit, this date cannot be sent */
failf(data, "date overflow");
fail = TRUE;
}
#endif
if(fail) {
Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2);
failf(data, "Syntax error: incorrect access date format");
state(data, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR;
break;
}
#if SIZEOF_TIME_T > SIZEOF_LONG
if(date > 0xffffffff)
;
else
#endif
{
if(strncasecompare(cmd, "atime", 5))
sshp->quote_attrs.atime = (unsigned long)date;
sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_ACMODTIME;
}
}
else if(strncasecompare(cmd, "mtime", 5)) {
time_t date = Curl_getdate_capped(sshc->quote_path1);
if(date == -1) {
Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2);
failf(data, "Syntax error: incorrect modification date format");
state(data, SSH_SFTP_CLOSE);
sshc->nextstate = SSH_NO_STATE;
sshc->actualcode = CURLE_QUOTE_ERROR;
break;
}
#if SIZEOF_TIME_T > SIZEOF_LONG
if(date > 0xffffffff)
;
else
#endif
{
else /* mtime */
sshp->quote_attrs.mtime = (unsigned long)date;
sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_ACMODTIME;
}
sshp->quote_attrs.flags = LIBSSH2_SFTP_ATTR_ACMODTIME;
}
/* Now send the completed structure... */