Merge pull request #544 from dvirsky/2.6

[redis.git] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index e56862882a3612133072e006daee2d250c599480..566b2b959cd2d6c7a0fdae950c4b3221ea4d8b1a 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -218,6 +218,10 @@ void computeDatasetDigest(unsigned char *final) {
 void debugCommand(redisClient *c) {
     if (!strcasecmp(c->argv[1]->ptr,"segfault")) {
         *((char*)-1) = 'x';
+    } else if (!strcasecmp(c->argv[1]->ptr,"oom")) {
+        void *ptr = zmalloc(ULONG_MAX); /* Should trigger an out of memory. */
+        zfree(ptr);
+        addReply(c,shared.ok);
     } else if (!strcasecmp(c->argv[1]->ptr,"assert")) {
         if (c->argc >= 3) c->argv[2] = tryObjectEncoding(c->argv[2]);
         redisAssertWithInfo(c,c->argv[0],1 == 2);