8000 Merge branch 'hotfix/issue-229' · devsnippet/phpredis@51264b7 · GitHub
[go: up one dir, main page]

Skip to content

Commit 51264b7

Browse files
committed
Merge branch 'hotfix/issue-229'
2 parents 1618839 + 5953e8f commit 51264b7

File tree

2 files changed

+908
-0
lines changed

2 files changed

+908
-0
lines changed

library.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,11 @@ PHPAPI int redis_sock_read_multibulk_reply_zipped_with_flag(INTERNAL_FUNCTION_PA
717717
}
718718

719719
if(inbuf[0] != '*') {
720+
IF_MULTI_OR_PIPELINE() {
721+
add_next_index_bool(z_tab, 0);
722+
} else {
723+
RETURN_FALSE;
724+
}
720725
return -1;
721726
}
722727
numElems = atoi(inbuf+1);
@@ -1085,6 +1090,11 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
10851090
}
10861091

10871092
if(inbuf[0] != '*') {
1093+
IF_MULTI_OR_PIPELINE() {
1094+
add_next_index_bool(z_tab, 0);
1095+
} else {
1096+
RETURN_FALSE;
1097+
}
10881098
return -1;
10891099
}
10901100
numElems = atoi(inbuf+1);
@@ -1127,6 +1137,11 @@ PHPAPI int redis_sock_read_multibulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, Red
11271137
}
11281138

11291139
if(inbuf[0] != '*') {
1140+
IF_MULTI_OR_PIPELINE() {
1141+
add_next_index_bool(z_tab, 0);
1142+
} else {
1143+
RETURN_FALSE;
1144+
}
11301145
return -1;
11311146
}
11321147
numElems = atoi(inbuf+1);
@@ -1201,6 +1216,11 @@ PHPAPI int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, R
12011216
}
12021217

12031218
if(inbuf[0] != '*') {
1219+
IF_MULTI_OR_PIPELINE() {
1220+
add_next_index_bool(z_tab, 0);
1221+
} else {
1222+
RETURN_FALSE;
1223+
}
12041224
return -1;
12051225
}
12061226
numElems = atoi(inbuf+1);

0 commit comments

Comments
 (0)
0