gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trim trailing spaces in error replies coming from rejectCommand (#7668)

Browse Source 
65a3307bc9 added rejectCommand which takes an robj reply and passes it
through addReplyErrorSafe to addReplyErrorLength.
The robj contains newline at it's end, but addReplyErrorSafe converts it
to spaces, and passes it to addReplyErrorLength which adds the protocol
newlines.

The result was that most error replies (like OOM) had extra two trailing
spaces in them.

(cherry picked from commit cdd925b2898ac270afdf3d72f065410a96980f80)
This commit is contained in:
Oran Agra 2020-08-18 08:28:43 +03:00
parent 1180537589
commit 6dcd641681
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/networking.c
View File

@ -412,10 +412,14 @@ void addReplyError(client *c, const char *err) {
* is emitted. */
void addReplyErrorSafe(client *c, char *s, size_t len) {
size_t j;
/* Trim any newlines at the end (ones will be added by addReplyErrorLength) */
while (s[len-1] == '\r' || s[len-1] == '\n')
len--;
/* Replace any newlines in the rest of the string with spaces. */
for (j = 0; j < len; j++) {
if (s[j] == '\r' || s[j] == '\n') s[j] = ' ';
}
addReplyErrorLength(c,s,sdslen(s));
addReplyErrorLength(c,s,len);
}
void addReplyErrorFormat(client *c, const char *fmt, ...) {