Blame openssh-5.8p1-glob.patch
|
Jan F |
71d3d9c |
diff -up openssh-5.8p1/sftp-glob.c.glob openssh-5.8p1/sftp-glob.c
|
|
Jan F |
71d3d9c |
--- openssh-5.8p1/sftp-glob.c.glob 2011-03-07 20:17:34.000000000 +0100
|
|
Jan F |
71d3d9c |
+++ openssh-5.8p1/sftp-glob.c 2011-03-07 20:18:47.000000000 +0100
|
|
Jan F |
71d3d9c |
@@ -145,5 +145,5 @@ remote_glob(struct sftp_conn *conn, cons
|
|
Jan F |
71d3d9c |
memset(&cur, 0, sizeof(cur));
|
|
Jan F |
71d3d9c |
cur.conn = conn;
|
|
Jan F |
71d3d9c |
|
|
Jan F |
71d3d9c |
- return(glob(pattern, flags | GLOB_ALTDIRFUNC, errfunc, pglob));
|
|
Jan F |
71d3d9c |
+ return(glob(pattern, flags | GLOB_LIMIT | GLOB_ALTDIRFUNC, errfunc, pglob));
|
|
Jan F |
71d3d9c |
}
|
|
 |
21bee69 |
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
|
|
|
21bee69 |
index 742b4b9..acae399 100644
|
|
|
21bee69 |
--- a/openbsd-compat/glob.c
|
|
|
21bee69 |
+++ b/openbsd-compat/glob.c
|
|
|
8395bb7 |
@@ -130,8 +130,8 @@ typedef char Char;
|
|
|
8395bb7 |
#define M_CLASS META(':')
|
|
|
21bee69 |
#define ismeta(c) (((c)&M_QUOTE) != 0)
|
|
|
21bee69 |
|
|
|
8395bb7 |
-#define GLOB_LIMIT_MALLOC 65536
|
|
|
21bee69 |
-#define GLOB_LIMIT_STAT 128
|
|
|
8395bb7 |
+#define GLOB_LIMIT_MALLOC 65536*64
|
|
|
8395bb7 |
+#define GLOB_LIMIT_STAT 128*64
|
|
|
21bee69 |
#define GLOB_LIMIT_READDIR 16384
|
|
|
21bee69 |
|
|
|
21bee69 |
/* Limit of recursion during matching attempts. */
|
|
|
21bee69 |
|