Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
f1e072c5
Commit
f1e072c5
authored
Apr 27, 2011
by
Pieter Noordhuis
Browse files
Check for \n after finding \r
parent
a244985d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/networking.c
View file @
f1e072c5
...
...
@@ -703,6 +703,10 @@ int processMultibulkBuffer(redisClient *c) {
if
(
newline
==
NULL
)
return
REDIS_ERR
;
/* Buffer should also contain \n */
if
(
newline
-
(
c
->
querybuf
)
>
((
signed
)
sdslen
(
c
->
querybuf
)
-
2
))
return
REDIS_ERR
;
/* We know for sure there is a whole line since newline != NULL,
* so go ahead and find out the multi bulk length. */
redisAssert
(
c
->
querybuf
[
0
]
==
'*'
);
...
...
@@ -724,9 +728,6 @@ int processMultibulkBuffer(redisClient *c) {
/* Setup argv array on client structure */
if
(
c
->
argv
)
zfree
(
c
->
argv
);
c
->
argv
=
zmalloc
(
sizeof
(
robj
*
)
*
c
->
multibulklen
);
/* Search new newline */
newline
=
strchr
(
c
->
querybuf
+
pos
,
'\r'
);
}
redisAssert
(
c
->
multibulklen
>
0
);
...
...
@@ -734,27 +735,30 @@ int processMultibulkBuffer(redisClient *c) {
/* Read bulk length if unknown */
if
(
c
->
bulklen
==
-
1
)
{
newline
=
strchr
(
c
->
querybuf
+
pos
,
'\r'
);
if
(
newline
!=
NULL
)
{
if
(
c
->
querybuf
[
pos
]
!=
'$'
)
{
addReplyErrorFormat
(
c
,
"Protocol error: expected '$', got '%c'"
,
c
->
querybuf
[
pos
]);
setProtocolError
(
c
,
pos
);
return
REDIS_ERR
;
}
ok
=
string2ll
(
c
->
querybuf
+
pos
+
1
,
newline
-
(
c
->
querybuf
+
pos
+
1
),
&
ll
);
if
(
!
ok
||
ll
<
0
||
ll
>
512
*
1024
*
1024
)
{
addReplyError
(
c
,
"Protocol error: invalid bulk length"
);
setProtocolError
(
c
,
pos
);
return
REDIS_ERR
;
}
pos
+=
newline
-
(
c
->
querybuf
+
pos
)
+
2
;
c
->
bulklen
=
ll
;
}
else
{
/* No newline in current buffer, so wait for more data */
if
(
newline
==
NULL
)
break
;
/* Buffer should also contain \n */
if
(
newline
-
(
c
->
querybuf
)
>
((
signed
)
sdslen
(
c
->
querybuf
)
-
2
))
break
;
if
(
c
->
querybuf
[
pos
]
!=
'$'
)
{
addReplyErrorFormat
(
c
,
"Protocol error: expected '$', got '%c'"
,
c
->
querybuf
[
pos
]);
setProtocolError
(
c
,
pos
);
return
REDIS_ERR
;
}
ok
=
string2ll
(
c
->
querybuf
+
pos
+
1
,
newline
-
(
c
->
querybuf
+
pos
+
1
),
&
ll
);
if
(
!
ok
||
ll
<
0
||
ll
>
512
*
1024
*
1024
)
{
addReplyError
(
c
,
"Protocol error: invalid bulk length"
);
setProtocolError
(
c
,
pos
);
return
REDIS_ERR
;
}
pos
+=
newline
-
(
c
->
querybuf
+
pos
)
+
2
;
c
->
bulklen
=
ll
;
}
/* Read bulk argument */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment