summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2017-12-14 12:21:32 +0100
committerGitHub <noreply@github.com>2017-12-14 12:21:32 +0100
commit398b2084af067ae4d669e0ce5a63d3bc89c639d3 (patch)
tree723f494c49bfd46b024a281ce4045527d7a65485
parent12e65a424c209bd922dc742f396f1b76bc6350d9 (diff)
parentf43eb5adcfa3be6368f116656348a29f22f580eb (diff)
downloadredis-398b2084af067ae4d669e0ce5a63d3bc89c639d3.tar.gz
Merge pull request #4528 from nashe/patch-oob-read-4527
Prevent off-by-one read in stringmatchlen()
-rw-r--r--src/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.c b/src/util.c
index 8d68f0bb1..36cbc43d3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -84,7 +84,7 @@ int stringmatchlen(const char *pattern, int patternLen,
}
match = 0;
while(1) {
- if (pattern[0] == '\\') {
+ if (pattern[0] == '\\' && patternLen >= 2) {
pattern++;
patternLen--;
if (pattern[0] == string[0])