]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
another minor rlm_redis_ippool_tool fix
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 21 Nov 2016 21:43:31 +0000 (16:43 -0500)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 21 Nov 2016 21:44:48 +0000 (16:44 -0500)
src/modules/rlm_redis/redis.c
src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c

index 00fcd94dd242f6551d1f2aebe8baf5fdca3d24ec..cb5e674fe310eca812b985739901f156470d3db4 100644 (file)
@@ -462,7 +462,6 @@ fr_redis_rcode_t fr_redis_pipeline_result(unsigned int *pipelined, fr_redis_rcod
 
        fr_strerror();  /* Clear any outstanding errors */
 
-#ifdef NDEBUG
        if ((size_t) *pipelined > out_len) {
                for (i = 0; i < (size_t)*pipelined; i++) {
                        if (redisGetReply(conn->handle, (void **)&reply) != REDIS_OK) break;
@@ -475,7 +474,6 @@ fr_redis_rcode_t fr_redis_pipeline_result(unsigned int *pipelined, fr_redis_rcod
                out[0] = NULL;
                return REDIS_RCODE_ERROR;
        }
-#endif
 
        for (i = 0; i < (size_t)*pipelined; i++) {
                bool maybe_more = false;
index edbd6aaf85b9ed15ae280e7ee23704591340fbe4..01b77a88d245aec68c65a9adbede7413b15ec447 100644 (file)
@@ -1065,7 +1065,7 @@ static int driver_get_stats(ippool_tool_stats_t *out, void *instance, uint8_t co
 
        IPPOOL_BUILD_KEY(key, key_p, key_prefix, key_prefix_len);
 
-       replies = talloc_zero_array(inst, redisReply *, pipelined);
+       MEM(replies = talloc_zero_array(inst, redisReply *, STATS_COMMANDS_TOTAL));
 
        gettimeofday(&now, NULL);