# HG changeset patch
# User Haelwenn Monnier <contact+github.com@hacktivis.me>
# Date 1590411269 -7200
# Node ID 3080aed32bf14cb37637dfb469b1fb4ee170a55c
# Parent  49cb3cf4bd6f1b989e91e54b64aa101b2a87456b
scp.c: Port OpenSSH CVE-2018-20685 fix (#80)

diff -r 49cb3cf4bd6f -r 3080aed32bf1 scp.c
--- a/scp.c	Fri Mar 27 23:23:11 2020 +0800
+++ b/scp.c	Mon May 25 14:54:29 2020 +0200
@@ -935,7 +935,8 @@
 			size = size * 10 + (*cp++ - '0');
 		if (*cp++ != ' ')
 			SCREWUP("size not delimited");
-		if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
+		if (*cp == '\0' || strchr(cp, '/') != NULL ||
+		    strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
 			run_err("error: unexpected filename: %s", cp);
 			exit(1);
 		}