From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 17 Aug 2022 08:51:07 +0000 (+0200)
Subject: libssh: make atime/mtime date overflow return error
X-Git-Tag: curl-7_85_0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c988ec9f41060144e175b519f9017c569ac8d3db;p=thirdparty%2Fcurl.git

libssh: make atime/mtime date overflow return error

Closes #9328
---

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index c2f71d0305..e0d9d71ae6 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -2911,47 +2911,34 @@ static void sftp_quote_stat(struct Curl_easy *data)
     }
     sshc->quote_attrs->flags |= SSH_FILEXFER_ATTR_UIDGID;
   }
-  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) {
-      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;
-      return;
+      failf(data, "incorrect date format for %.*s", 5, cmd);
+      fail = TRUE;
     }
 #if SIZEOF_TIME_T > 4
-    if(date > 0xffffffff)
-      ; /* avoid setting a capped time */
-    else
-#endif
-    {
-      sshc->quote_attrs->atime = (uint32_t)date;
-      sshc->quote_attrs->flags |= SSH_FILEXFER_ATTR_ACMODTIME;
+    else if(date > 0xffffffff) {
+      failf(data, "date overflow");
+      fail = TRUE; /* avoid setting a capped time */
     }
-  }
-  else if(strncasecompare(cmd, "mtime", 5)) {
-    time_t date = Curl_getdate_capped(sshc->quote_path1);
-    if(date == -1) {
+#endif
+    if(fail) {
       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;
       return;
     }
-#if SIZEOF_TIME_T > 4
-    if(date > 0xffffffff)
-      ; /* avoid setting a capped time */
-    else
-#endif
-    {
+    if(strncasecompare(cmd, "atime", 5))
+      sshc->quote_attrs->atime = (uint32_t)date;
+    else /* mtime */
       sshc->quote_attrs->mtime = (uint32_t)date;
-      sshc->quote_attrs->flags |= SSH_FILEXFER_ATTR_ACMODTIME;
-    }
+
+    sshc->quote_attrs->flags |= SSH_FILEXFER_ATTR_ACMODTIME;
   }
 
   /* Now send the completed structure... */