diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-05-04 06:10:48 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-05-10 11:38:04 +1000 |
commit | e661a86353e11592c7ed6a847e19a83609f49e77 (patch) | |
tree | 5fe2c206d56dd4296a79e20ca6cfbbb83cb7c40c /hostfile.c | |
parent | 0ef1de742be2ee4b10381193fe90730925b7f027 (diff) |
upstream commit
Remove pattern length argument from match_pattern_list(), we
only ever use it for strlen(pattern).
Prompted by hanno AT hboeck.de pointing an out-of-bound read
error caused by an incorrect pattern length found using AFL
and his own tools.
ok markus@
Diffstat (limited to 'hostfile.c')
-rw-r--r-- | hostfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hostfile.c b/hostfile.c index d9fdcb872..2850a4793 100644 --- a/hostfile.c +++ b/hostfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: hostfile.c,v 1.65 2015/03/31 22:57:06 djm Exp $ */ | 1 | /* $OpenBSD: hostfile.c,v 1.66 2015/05/04 06:10:48 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -663,7 +663,7 @@ match_maybe_hashed(const char *host, const char *names, int *was_hashed) | |||
663 | return nlen == strlen(hashed_host) && | 663 | return nlen == strlen(hashed_host) && |
664 | strncmp(hashed_host, names, nlen) == 0; | 664 | strncmp(hashed_host, names, nlen) == 0; |
665 | } | 665 | } |
666 | return match_hostname(host, names, nlen) == 1; | 666 | return match_hostname(host, names) == 1; |
667 | } | 667 | } |
668 | 668 | ||
669 | int | 669 | int |