Merge pull request #7370 from oranagra/no_queue_in_aborted_multi

Don't queue commands in an already aborted MULTI state

1 files changed, 7 insertions, 0 deletions

diff --git a/src/multi.c b/src/multi.c
index a331a6240..3e606fcec 100644
--- a/src/multi.c
+++ b/src/multi.c
@@ -58,6 +58,13 @@ void queueMultiCommand(client *c) {
     multiCmd *mc;
     int j;
 
+    /* No sense to waste memory if the transaction is already aborted.
+     * this is useful in case client sends these in a pipeline, or doesn't
+     * bother to read previous responses and didn't notice the multi was already
+     * aborted. */
+    if (c->flags & CLIENT_DIRTY_EXEC)
+        return;
+
     c->mstate.commands = zrealloc(c->mstate.commands,
             sizeof(multiCmd)*(c->mstate.count+1));
     mc = c->mstate.commands+c->mstate.count;