2011-03-07 19:31:52 +00:00
|
|
|
diff -up openssh-5.8p1/sftp-glob.c.glob openssh-5.8p1/sftp-glob.c
|
|
|
|
|
--- openssh-5.8p1/sftp-glob.c.glob 2011-03-07 20:17:34.000000000 +0100
|
|
|
|
|
+++ openssh-5.8p1/sftp-glob.c 2011-03-07 20:18:47.000000000 +0100
|
|
|
|
|
@@ -145,5 +145,5 @@ remote_glob(struct sftp_conn *conn, cons
|
|
|
|
|
memset(&cur, 0, sizeof(cur));
|
|
|
|
|
cur.conn = conn;
|
|
|
|
|
|
|
|
|
|
- return(glob(pattern, flags | GLOB_ALTDIRFUNC, errfunc, pglob));
|
|
|
|
|
+ return(glob(pattern, flags | GLOB_LIMIT | GLOB_ALTDIRFUNC, errfunc, pglob));
|
|
|
|
|
}
|
2015-06-25 14:10:35 +00:00
|
|
|
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
|
|
|
|
|
index 742b4b9..acae399 100644
|
|
|
|
|
--- a/openbsd-compat/glob.c
|
|
|
|
|
+++ b/openbsd-compat/glob.c
|
2015-09-30 13:27:08 +00:00
|
|
|
@@ -130,8 +130,8 @@ typedef char Char;
|
|
|
|
|
#define M_CLASS META(':')
|
2015-06-25 14:10:35 +00:00
|
|
|
#define ismeta(c) (((c)&M_QUOTE) != 0)
|
|
|
|
|
|
2015-09-30 13:27:08 +00:00
|
|
|
-#define GLOB_LIMIT_MALLOC 65536
|
2015-06-25 14:10:35 +00:00
|
|
|
-#define GLOB_LIMIT_STAT 128
|
2015-09-30 13:27:08 +00:00
|
|
|
+#define GLOB_LIMIT_MALLOC 65536*64
|
|
|
|
|
+#define GLOB_LIMIT_STAT 128*64
|
2015-06-25 14:10:35 +00:00
|
|
|
#define GLOB_LIMIT_READDIR 16384
|
|
|
|
|
|
|
|
|
|
/* Limit of recursion during matching attempts. */
|
|
|
|
|
|
