shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

match: Limit possible recursion when parsing wildcards to a sensible number

Browse Source 
Fixes T186

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2019-10-29 14:12:56 +01:00
committed by Andreas Schneider
parent cf0beff987
commit 31f9c39479
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/match.c
View File

@@ -43,14 +43,16 @@
#include "libssh/priv.h" #include "libssh/priv.h"
#define MAX_MATCH_RECURSION 32
/* /*
* Returns true if the given string matches the pattern (which may contain ? * Returns true if the given string matches the pattern (which may contain ?
* and * as wildcards), and zero if it does not match. * and * as wildcards), and zero if it does not match.
*/ */
static int match_pattern(const char *s, const char *pattern) static int match_pattern(const char *s, const char *pattern, size_t limit)
{ {
bool had_asterisk = false; bool had_asterisk = false;
if (s == NULL || pattern == NULL) { if (s == NULL || pattern == NULL || limit <= 0) {
return 0; return 0;
} }
@@ -79,7 +81,7 @@ static int match_pattern(const char *s, const char *pattern)
* those. * those.
*/ */
for (; *s; s++) for (; *s; s++)
if (*s == *pattern && match_pattern(s + 1, pattern + 1)) { if (*s == *pattern && match_pattern(s + 1, pattern + 1, limit - 1)) {
return 1; return 1;
} }
/* Failed. */ /* Failed. */
@@ -90,7 +92,7 @@ static int match_pattern(const char *s, const char *pattern)
* match at each position. * match at each position.
*/ */
for (; *s; s++) { for (; *s; s++) {
if (match_pattern(s, pattern)) { if (match_pattern(s, pattern, limit - 1)) {
return 1; return 1;
} }
} }
@@ -167,7 +169,7 @@ int match_pattern_list(const char *string, const char *pattern,
sub[subi] = '\0'; sub[subi] = '\0';
/* Try to match the subpattern against the string. */ /* Try to match the subpattern against the string. */
if (match_pattern(string, sub)) { if (match_pattern(string, sub, MAX_MATCH_RECURSION)) {
if (negated) { if (negated) {
return -1; /* Negative */ return -1; /* Negative */
} else { } else {