summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-05-20 16:15:13 +0200
committerantirez <antirez@gmail.com>2014-05-20 16:15:13 +0200
commitce2b2f22d9858eeb31ed7159d9e33b620da10c24 (patch)
treeb98746ebf93599623f803530d0e0384205cb3913
parent4ddc77041f6de5b47b88e54e790a51bfcad0d197 (diff)
parentce7c47265bfd133e0205152820f89a04b16333ef (diff)
downloadredis-ce2b2f22d9858eeb31ed7159d9e33b620da10c24.tar.gz
Merge branch 'unstable' of github.com:/antirez/redis into unstable
-rw-r--r--src/scripting.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/scripting.c b/src/scripting.c
index 529abc370..4b485d9b4 100644
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -237,7 +237,9 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
if (obj_s == NULL) break; /* Not a string. */
/* Try to use a cached object. */
- if (cached_objects[j] && cached_objects_len[j] >= obj_len) {
+ if (j < LUA_CMD_OBJCACHE_SIZE && cached_objects[j] &&
+ cached_objects_len[j] >= obj_len)
+ {
char *s = cached_objects[j]->ptr;
struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));