redict/deps/hiredis/hiredis.c

1189 lines
35 KiB
C
Raw Normal View History

/*
* Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
* Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
* Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
* Jan-Erik Rediger <janerik at fnordig dot com>
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Redis nor the names of its contributors may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "fmacros.h"
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <errno.h>
#include <ctype.h>
#include "hiredis.h"
#include "net.h"
#include "sds.h"
#include "async.h"
#include "win32.h"
extern int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout);
extern int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout);
static redisContextFuncs redisContextDefaultFuncs = {
.free_privctx = NULL,
.async_read = redisAsyncRead,
.async_write = redisAsyncWrite,
.read = redisNetRead,
.write = redisNetWrite
};
static redisReply *createReplyObject(int type);
static void *createStringObject(const redisReadTask *task, char *str, size_t len);
static void *createArrayObject(const redisReadTask *task, size_t elements);
static void *createIntegerObject(const redisReadTask *task, long long value);
static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len);
static void *createNilObject(const redisReadTask *task);
static void *createBoolObject(const redisReadTask *task, int bval);
/* Default set of functions to build the reply. Keep in mind that such a
* function returning NULL is interpreted as OOM. */
static redisReplyObjectFunctions defaultFunctions = {
createStringObject,
createArrayObject,
createIntegerObject,
createDoubleObject,
createNilObject,
createBoolObject,
freeReplyObject
};
/* Create a reply object */
static redisReply *createReplyObject(int type) {
redisReply *r = hi_calloc(1,sizeof(*r));
if (r == NULL)
return NULL;
r->type = type;
return r;
}
/* Free a reply object */
void freeReplyObject(void *reply) {
redisReply *r = reply;
size_t j;
if (r == NULL)
return;
switch(r->type) {
case REDIS_REPLY_INTEGER:
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
case REDIS_REPLY_NIL:
case REDIS_REPLY_BOOL:
break; /* Nothing to free */
case REDIS_REPLY_ARRAY:
case REDIS_REPLY_MAP:
case REDIS_REPLY_SET:
case REDIS_REPLY_PUSH:
if (r->element != NULL) {
for (j = 0; j < r->elements; j++)
freeReplyObject(r->element[j]);
hi_free(r->element);
}
break;
case REDIS_REPLY_ERROR:
case REDIS_REPLY_STATUS:
case REDIS_REPLY_STRING:
case REDIS_REPLY_DOUBLE:
case REDIS_REPLY_VERB:
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
case REDIS_REPLY_BIGNUM:
hi_free(r->str);
break;
}
hi_free(r);
}
static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
redisReply *r, *parent;
char *buf;
r = createReplyObject(task->type);
if (r == NULL)
return NULL;
assert(task->type == REDIS_REPLY_ERROR ||
task->type == REDIS_REPLY_STATUS ||
task->type == REDIS_REPLY_STRING ||
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
task->type == REDIS_REPLY_VERB ||
task->type == REDIS_REPLY_BIGNUM);
/* Copy string value */
if (task->type == REDIS_REPLY_VERB) {
buf = hi_malloc(len-4+1); /* Skip 4 bytes of verbatim type header. */
if (buf == NULL) goto oom;
memcpy(r->vtype,str,3);
r->vtype[3] = '\0';
memcpy(buf,str+4,len-4);
buf[len-4] = '\0';
r->len = len - 4;
} else {
buf = hi_malloc(len+1);
if (buf == NULL) goto oom;
memcpy(buf,str,len);
buf[len] = '\0';
r->len = len;
}
r->str = buf;
if (task->parent) {
parent = task->parent->obj;
assert(parent->type == REDIS_REPLY_ARRAY ||
parent->type == REDIS_REPLY_MAP ||
parent->type == REDIS_REPLY_SET ||
parent->type == REDIS_REPLY_PUSH);
parent->element[task->idx] = r;
}
return r;
oom:
freeReplyObject(r);
return NULL;
}
static void *createArrayObject(const redisReadTask *task, size_t elements) {
redisReply *r, *parent;
r = createReplyObject(task->type);
if (r == NULL)
return NULL;
if (elements > 0) {
r->element = hi_calloc(elements,sizeof(redisReply*));
if (r->element == NULL) {
freeReplyObject(r);
return NULL;
}
}
r->elements = elements;
if (task->parent) {
parent = task->parent->obj;
assert(parent->type == REDIS_REPLY_ARRAY ||
parent->type == REDIS_REPLY_MAP ||
parent->type == REDIS_REPLY_SET ||
parent->type == REDIS_REPLY_PUSH);
parent->element[task->idx] = r;
}
return r;
}
static void *createIntegerObject(const redisReadTask *task, long long value) {
redisReply *r, *parent;
r = createReplyObject(REDIS_REPLY_INTEGER);
if (r == NULL)
return NULL;
r->integer = value;
if (task->parent) {
parent = task->parent->obj;
assert(parent->type == REDIS_REPLY_ARRAY ||
parent->type == REDIS_REPLY_MAP ||
parent->type == REDIS_REPLY_SET ||
parent->type == REDIS_REPLY_PUSH);
parent->element[task->idx] = r;
}
return r;
}
static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len) {
redisReply *r, *parent;
r = createReplyObject(REDIS_REPLY_DOUBLE);
if (r == NULL)
return NULL;
r->dval = value;
r->str = hi_malloc(len+1);
if (r->str == NULL) {
freeReplyObject(r);
return NULL;
}
/* The double reply also has the original protocol string representing a
* double as a null terminated string. This way the caller does not need
* to format back for string conversion, especially since Redis does efforts
* to make the string more human readable avoiding the calssical double
* decimal string conversion artifacts. */
memcpy(r->str, str, len);
r->str[len] = '\0';
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
r->len = len;
if (task->parent) {
parent = task->parent->obj;
assert(parent->type == REDIS_REPLY_ARRAY ||
parent->type == REDIS_REPLY_MAP ||
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
parent->type == REDIS_REPLY_SET ||
parent->type == REDIS_REPLY_PUSH);
parent->element[task->idx] = r;
}
return r;
}
static void *createNilObject(const redisReadTask *task) {
redisReply *r, *parent;
r = createReplyObject(REDIS_REPLY_NIL);
if (r == NULL)
return NULL;
if (task->parent) {
parent = task->parent->obj;
assert(parent->type == REDIS_REPLY_ARRAY ||
parent->type == REDIS_REPLY_MAP ||
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
parent->type == REDIS_REPLY_SET ||
parent->type == REDIS_REPLY_PUSH);
parent->element[task->idx] = r;
}
return r;
}
static void *createBoolObject(const redisReadTask *task, int bval) {
redisReply *r, *parent;
r = createReplyObject(REDIS_REPLY_BOOL);
if (r == NULL)
return NULL;
r->integer = bval != 0;
if (task->parent) {
parent = task->parent->obj;
assert(parent->type == REDIS_REPLY_ARRAY ||
parent->type == REDIS_REPLY_MAP ||
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
parent->type == REDIS_REPLY_SET ||
parent->type == REDIS_REPLY_PUSH);
parent->element[task->idx] = r;
}
return r;
}
/* Return the number of digits of 'v' when converted to string in radix 10.
* Implementation borrowed from link in redis/src/util.c:string2ll(). */
static uint32_t countDigits(uint64_t v) {
uint32_t result = 1;
for (;;) {
if (v < 10) return result;
if (v < 100) return result + 1;
if (v < 1000) return result + 2;
if (v < 10000) return result + 3;
v /= 10000U;
result += 4;
}
}
/* Helper that calculates the bulk length given a certain string length. */
static size_t bulklen(size_t len) {
return 1+countDigits(len)+2+len+2;
}
int redisvFormatCommand(char **target, const char *format, va_list ap) {
const char *c = format;
char *cmd = NULL; /* final command */
int pos; /* position in final command */
hisds curarg, newarg; /* current argument */
int touched = 0; /* was the current argument touched? */
char **curargv = NULL, **newargv = NULL;
int argc = 0;
int totlen = 0;
int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
int j;
/* Abort if there is not target to set */
if (target == NULL)
return -1;
/* Build the command string accordingly to protocol */
curarg = hi_sdsempty();
if (curarg == NULL)
return -1;
while(*c != '\0') {
if (*c != '%' || c[1] == '\0') {
if (*c == ' ') {
if (touched) {
newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
if (newargv == NULL) goto memory_err;
curargv = newargv;
curargv[argc++] = curarg;
totlen += bulklen(hi_sdslen(curarg));
/* curarg is put in argv so it can be overwritten. */
curarg = hi_sdsempty();
if (curarg == NULL) goto memory_err;
touched = 0;
}
} else {
newarg = hi_sdscatlen(curarg,c,1);
if (newarg == NULL) goto memory_err;
curarg = newarg;
touched = 1;
}
} else {
char *arg;
size_t size;
/* Set newarg so it can be checked even if it is not touched. */
newarg = curarg;
switch(c[1]) {
case 's':
arg = va_arg(ap,char*);
size = strlen(arg);
if (size > 0)
newarg = hi_sdscatlen(curarg,arg,size);
break;
case 'b':
arg = va_arg(ap,char*);
size = va_arg(ap,size_t);
if (size > 0)
newarg = hi_sdscatlen(curarg,arg,size);
break;
case '%':
newarg = hi_sdscat(curarg,"%");
break;
default:
/* Try to detect printf format */
{
static const char intfmts[] = "diouxX";
static const char flags[] = "#0-+ ";
char _format[16];
const char *_p = c+1;
size_t _l = 0;
va_list _cpy;
/* Flags */
while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
/* Field width */
while (*_p != '\0' && isdigit(*_p)) _p++;
/* Precision */
if (*_p == '.') {
_p++;
while (*_p != '\0' && isdigit(*_p)) _p++;
}
/* Copy va_list before consuming with va_arg */
va_copy(_cpy,ap);
/* Integer conversion (without modifiers) */
if (strchr(intfmts,*_p) != NULL) {
va_arg(ap,int);
goto fmt_valid;
}
/* Double conversion (without modifiers) */
if (strchr("eEfFgGaA",*_p) != NULL) {
va_arg(ap,double);
goto fmt_valid;
}
/* Size: char */
if (_p[0] == 'h' && _p[1] == 'h') {
_p += 2;
if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
va_arg(ap,int); /* char gets promoted to int */
goto fmt_valid;
}
goto fmt_invalid;
}
/* Size: short */
if (_p[0] == 'h') {
_p += 1;
if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
va_arg(ap,int); /* short gets promoted to int */
goto fmt_valid;
}
goto fmt_invalid;
}
/* Size: long long */
if (_p[0] == 'l' && _p[1] == 'l') {
_p += 2;
if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
va_arg(ap,long long);
goto fmt_valid;
}
goto fmt_invalid;
}
/* Size: long */
if (_p[0] == 'l') {
_p += 1;
if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
va_arg(ap,long);
goto fmt_valid;
}
goto fmt_invalid;
}
fmt_invalid:
va_end(_cpy);
goto format_err;
fmt_valid:
_l = (_p+1)-c;
if (_l < sizeof(_format)-2) {
memcpy(_format,c,_l);
_format[_l] = '\0';
newarg = hi_sdscatvprintf(curarg,_format,_cpy);
/* Update current position (note: outer blocks
* increment c twice so compensate here) */
c = _p-1;
}
va_end(_cpy);
break;
}
}
if (newarg == NULL) goto memory_err;
curarg = newarg;
touched = 1;
c++;
}
c++;
}
/* Add the last argument if needed */
if (touched) {
newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
if (newargv == NULL) goto memory_err;
curargv = newargv;
curargv[argc++] = curarg;
totlen += bulklen(hi_sdslen(curarg));
} else {
hi_sdsfree(curarg);
}
/* Clear curarg because it was put in curargv or was free'd. */
curarg = NULL;
/* Add bytes needed to hold multi bulk count */
totlen += 1+countDigits(argc)+2;
/* Build the command at protocol level */
cmd = hi_malloc(totlen+1);
if (cmd == NULL) goto memory_err;
pos = sprintf(cmd,"*%d\r\n",argc);
for (j = 0; j < argc; j++) {
pos += sprintf(cmd+pos,"$%zu\r\n",hi_sdslen(curargv[j]));
memcpy(cmd+pos,curargv[j],hi_sdslen(curargv[j]));
pos += hi_sdslen(curargv[j]);
hi_sdsfree(curargv[j]);
cmd[pos++] = '\r';
cmd[pos++] = '\n';
}
assert(pos == totlen);
cmd[pos] = '\0';
hi_free(curargv);
*target = cmd;
return totlen;
format_err:
error_type = -2;
goto cleanup;
memory_err:
error_type = -1;
goto cleanup;
cleanup:
if (curargv) {
while(argc--)
hi_sdsfree(curargv[argc]);
hi_free(curargv);
}
hi_sdsfree(curarg);
hi_free(cmd);
return error_type;
}
/* Format a command according to the Redis protocol. This function
* takes a format similar to printf:
*
* %s represents a C null terminated string you want to interpolate
* %b represents a binary safe string
*
* When using %b you need to provide both the pointer to the string
* and the length in bytes as a size_t. Examples:
*
* len = redisFormatCommand(target, "GET %s", mykey);
* len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
*/
int redisFormatCommand(char **target, const char *format, ...) {
va_list ap;
int len;
va_start(ap,format);
len = redisvFormatCommand(target,format,ap);
va_end(ap);
/* The API says "-1" means bad result, but we now also return "-2" in some
* cases. Force the return value to always be -1. */
if (len < 0)
len = -1;
return len;
}
/* Format a command according to the Redis protocol using an hisds string and
* hi_sdscatfmt for the processing of arguments. This function takes the
* number of arguments, an array with arguments and an array with their
* lengths. If the latter is set to NULL, strlen will be used to compute the
* argument lengths.
*/
long long redisFormatSdsCommandArgv(hisds *target, int argc, const char **argv,
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
const size_t *argvlen)
{
hisds cmd, aux;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
unsigned long long totlen, len;
int j;
/* Abort on a NULL target */
if (target == NULL)
return -1;
/* Calculate our total size */
totlen = 1+countDigits(argc)+2;
for (j = 0; j < argc; j++) {
len = argvlen ? argvlen[j] : strlen(argv[j]);
totlen += bulklen(len);
}
/* Use an SDS string for command construction */
cmd = hi_sdsempty();
if (cmd == NULL)
return -1;
/* We already know how much storage we need */
aux = hi_sdsMakeRoomFor(cmd, totlen);
if (aux == NULL) {
hi_sdsfree(cmd);
return -1;
}
cmd = aux;
/* Construct command */
cmd = hi_sdscatfmt(cmd, "*%i\r\n", argc);
for (j=0; j < argc; j++) {
len = argvlen ? argvlen[j] : strlen(argv[j]);
cmd = hi_sdscatfmt(cmd, "$%U\r\n", len);
cmd = hi_sdscatlen(cmd, argv[j], len);
cmd = hi_sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
}
assert(hi_sdslen(cmd)==totlen);
*target = cmd;
return totlen;
}
void redisFreeSdsCommand(hisds cmd) {
hi_sdsfree(cmd);
}
/* Format a command according to the Redis protocol. This function takes the
* number of arguments, an array with arguments and an array with their
* lengths. If the latter is set to NULL, strlen will be used to compute the
* argument lengths.
*/
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
long long redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
char *cmd = NULL; /* final command */
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
size_t pos; /* position in final command */
size_t len, totlen;
int j;
/* Abort on a NULL target */
if (target == NULL)
return -1;
/* Calculate number of bytes needed for the command */
totlen = 1+countDigits(argc)+2;
for (j = 0; j < argc; j++) {
len = argvlen ? argvlen[j] : strlen(argv[j]);
totlen += bulklen(len);
}
/* Build the command at protocol level */
cmd = hi_malloc(totlen+1);
if (cmd == NULL)
return -1;
pos = sprintf(cmd,"*%d\r\n",argc);
for (j = 0; j < argc; j++) {
len = argvlen ? argvlen[j] : strlen(argv[j]);
pos += sprintf(cmd+pos,"$%zu\r\n",len);
memcpy(cmd+pos,argv[j],len);
pos += len;
cmd[pos++] = '\r';
cmd[pos++] = '\n';
}
assert(pos == totlen);
cmd[pos] = '\0';
*target = cmd;
return totlen;
}
void redisFreeCommand(char *cmd) {
hi_free(cmd);
}
void __redisSetError(redisContext *c, int type, const char *str) {
size_t len;
c->err = type;
if (str != NULL) {
len = strlen(str);
len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
memcpy(c->errstr,str,len);
c->errstr[len] = '\0';
} else {
/* Only REDIS_ERR_IO may lack a description! */
assert(type == REDIS_ERR_IO);
strerror_r(errno, c->errstr, sizeof(c->errstr));
}
}
redisReader *redisReaderCreate(void) {
return redisReaderCreateWithFunctions(&defaultFunctions);
}
static void redisPushAutoFree(void *privdata, void *reply) {
(void)privdata;
freeReplyObject(reply);
}
static redisContext *redisContextInit(void) {
redisContext *c;
c = hi_calloc(1, sizeof(*c));
if (c == NULL)
return NULL;
c->funcs = &redisContextDefaultFuncs;
c->obuf = hi_sdsempty();
c->reader = redisReaderCreate();
c->fd = REDIS_INVALID_FD;
if (c->obuf == NULL || c->reader == NULL) {
redisFree(c);
return NULL;
}
return c;
}
void redisFree(redisContext *c) {
if (c == NULL)
return;
redisNetClose(c);
hi_sdsfree(c->obuf);
redisReaderFree(c->reader);
hi_free(c->tcp.host);
hi_free(c->tcp.source_addr);
hi_free(c->unix_sock.path);
hi_free(c->connect_timeout);
hi_free(c->command_timeout);
hi_free(c->saddr);
if (c->privdata && c->free_privdata)
c->free_privdata(c->privdata);
if (c->funcs->free_privctx)
c->funcs->free_privctx(c->privctx);
memset(c, 0xff, sizeof(*c));
hi_free(c);
}
redisFD redisFreeKeepFd(redisContext *c) {
redisFD fd = c->fd;
c->fd = REDIS_INVALID_FD;
redisFree(c);
return fd;
}
int redisReconnect(redisContext *c) {
c->err = 0;
memset(c->errstr, '\0', strlen(c->errstr));
if (c->privctx && c->funcs->free_privctx) {
c->funcs->free_privctx(c->privctx);
c->privctx = NULL;
}
redisNetClose(c);
hi_sdsfree(c->obuf);
redisReaderFree(c->reader);
c->obuf = hi_sdsempty();
c->reader = redisReaderCreate();
if (c->obuf == NULL || c->reader == NULL) {
__redisSetError(c, REDIS_ERR_OOM, "Out of memory");
return REDIS_ERR;
}
int ret = REDIS_ERR;
if (c->connection_type == REDIS_CONN_TCP) {
ret = redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
c->connect_timeout, c->tcp.source_addr);
} else if (c->connection_type == REDIS_CONN_UNIX) {
ret = redisContextConnectUnix(c, c->unix_sock.path, c->connect_timeout);
} else {
/* Something bad happened here and shouldn't have. There isn't
enough information in the context to reconnect. */
__redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
ret = REDIS_ERR;
}
if (c->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
redisContextSetTimeout(c, *c->command_timeout);
}
return ret;
}
redisContext *redisConnectWithOptions(const redisOptions *options) {
redisContext *c = redisContextInit();
if (c == NULL) {
return NULL;
}
if (!(options->options & REDIS_OPT_NONBLOCK)) {
c->flags |= REDIS_BLOCK;
}
if (options->options & REDIS_OPT_REUSEADDR) {
c->flags |= REDIS_REUSEADDR;
}
if (options->options & REDIS_OPT_NOAUTOFREE) {
c->flags |= REDIS_NO_AUTO_FREE;
}
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (options->options & REDIS_OPT_NOAUTOFREEREPLIES) {
c->flags |= REDIS_NO_AUTO_FREE_REPLIES;
}
/* Set any user supplied RESP3 PUSH handler or use freeReplyObject
* as a default unless specifically flagged that we don't want one. */
if (options->push_cb != NULL)
redisSetPushCallback(c, options->push_cb);
else if (!(options->options & REDIS_OPT_NO_PUSH_AUTOFREE))
redisSetPushCallback(c, redisPushAutoFree);
c->privdata = options->privdata;
c->free_privdata = options->free_privdata;
if (redisContextUpdateConnectTimeout(c, options->connect_timeout) != REDIS_OK ||
redisContextUpdateCommandTimeout(c, options->command_timeout) != REDIS_OK) {
__redisSetError(c, REDIS_ERR_OOM, "Out of memory");
return c;
}
if (options->type == REDIS_CONN_TCP) {
redisContextConnectBindTcp(c, options->endpoint.tcp.ip,
options->endpoint.tcp.port, options->connect_timeout,
options->endpoint.tcp.source_addr);
} else if (options->type == REDIS_CONN_UNIX) {
redisContextConnectUnix(c, options->endpoint.unix_socket,
options->connect_timeout);
} else if (options->type == REDIS_CONN_USERFD) {
c->fd = options->endpoint.fd;
c->flags |= REDIS_CONNECTED;
} else {
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
redisFree(c);
return NULL;
}
if (options->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
redisContextSetTimeout(c, *options->command_timeout);
}
return c;
}
/* Connect to a Redis instance. On error the field error in the returned
* context will be set to the return value of the error function.
* When no set of reply functions is given, the default set will be used. */
redisContext *redisConnect(const char *ip, int port) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
return redisConnectWithOptions(&options);
}
redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
options.connect_timeout = &tv;
return redisConnectWithOptions(&options);
}
redisContext *redisConnectNonBlock(const char *ip, int port) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
options.options |= REDIS_OPT_NONBLOCK;
return redisConnectWithOptions(&options);
}
redisContext *redisConnectBindNonBlock(const char *ip, int port,
const char *source_addr) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
options.endpoint.tcp.source_addr = source_addr;
options.options |= REDIS_OPT_NONBLOCK;
return redisConnectWithOptions(&options);
}
redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
const char *source_addr) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
options.endpoint.tcp.source_addr = source_addr;
options.options |= REDIS_OPT_NONBLOCK|REDIS_OPT_REUSEADDR;
return redisConnectWithOptions(&options);
}
redisContext *redisConnectUnix(const char *path) {
redisOptions options = {0};
REDIS_OPTIONS_SET_UNIX(&options, path);
return redisConnectWithOptions(&options);
}
redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
redisOptions options = {0};
REDIS_OPTIONS_SET_UNIX(&options, path);
options.connect_timeout = &tv;
return redisConnectWithOptions(&options);
}
redisContext *redisConnectUnixNonBlock(const char *path) {
redisOptions options = {0};
REDIS_OPTIONS_SET_UNIX(&options, path);
options.options |= REDIS_OPT_NONBLOCK;
return redisConnectWithOptions(&options);
}
redisContext *redisConnectFd(redisFD fd) {
redisOptions options = {0};
options.type = REDIS_CONN_USERFD;
options.endpoint.fd = fd;
return redisConnectWithOptions(&options);
}
/* Set read/write timeout on a blocking socket. */
int redisSetTimeout(redisContext *c, const struct timeval tv) {
if (c->flags & REDIS_BLOCK)
return redisContextSetTimeout(c,tv);
return REDIS_ERR;
}
/* Enable connection KeepAlive. */
int redisEnableKeepAlive(redisContext *c) {
if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
return REDIS_ERR;
return REDIS_OK;
}
/* Set a user provided RESP3 PUSH handler and return any old one set. */
redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn) {
redisPushFn *old = c->push_cb;
c->push_cb = fn;
return old;
}
/* Use this function to handle a read event on the descriptor. It will try
* and read some bytes from the socket and feed them to the reply parser.
*
* After this function is called, you may use redisGetReplyFromReader to
* see if there is a reply available. */
int redisBufferRead(redisContext *c) {
char buf[1024*16];
int nread;
/* Return early when the context has seen an error. */
if (c->err)
return REDIS_ERR;
nread = c->funcs->read(c, buf, sizeof(buf));
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (nread < 0) {
return REDIS_ERR;
}
if (nread > 0 && redisReaderFeed(c->reader, buf, nread) != REDIS_OK) {
__redisSetError(c, c->reader->err, c->reader->errstr);
return REDIS_ERR;
}
return REDIS_OK;
}
/* Write the output buffer to the socket.
*
* Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
* successfully written to the socket. When the buffer is empty after the
* write operation, "done" is set to 1 (if given).
*
* Returns REDIS_ERR if an error occurred trying to write and sets
* c->errstr to hold the appropriate error string.
*/
int redisBufferWrite(redisContext *c, int *done) {
/* Return early when the context has seen an error. */
if (c->err)
return REDIS_ERR;
if (hi_sdslen(c->obuf) > 0) {
ssize_t nwritten = c->funcs->write(c);
if (nwritten < 0) {
return REDIS_ERR;
} else if (nwritten > 0) {
if (nwritten == (ssize_t)hi_sdslen(c->obuf)) {
hi_sdsfree(c->obuf);
c->obuf = hi_sdsempty();
if (c->obuf == NULL)
goto oom;
} else {
if (hi_sdsrange(c->obuf,nwritten,-1) < 0) goto oom;
}
}
}
if (done != NULL) *done = (hi_sdslen(c->obuf) == 0);
return REDIS_OK;
oom:
__redisSetError(c, REDIS_ERR_OOM, "Out of memory");
return REDIS_ERR;
}
/* Internal helper that returns 1 if the reply was a RESP3 PUSH
* message and we handled it with a user-provided callback. */
static int redisHandledPushReply(redisContext *c, void *reply) {
if (reply && c->push_cb && redisIsPushReply(reply)) {
c->push_cb(c->privdata, reply);
return 1;
}
return 0;
}
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
/* Get a reply from our reader or set an error in the context. */
int redisGetReplyFromReader(redisContext *c, void **reply) {
if (redisReaderGetReply(c->reader, reply) == REDIS_ERR) {
__redisSetError(c,c->reader->err,c->reader->errstr);
return REDIS_ERR;
}
return REDIS_OK;
}
/* Internal helper to get the next reply from our reader while handling
* any PUSH messages we encounter along the way. This is separate from
* redisGetReplyFromReader so as to not change its behavior. */
static int redisNextInBandReplyFromReader(redisContext *c, void **reply) {
do {
if (redisGetReplyFromReader(c, reply) == REDIS_ERR)
return REDIS_ERR;
} while (redisHandledPushReply(c, *reply));
return REDIS_OK;
}
int redisGetReply(redisContext *c, void **reply) {
int wdone = 0;
void *aux = NULL;
/* Try to read pending replies */
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (redisNextInBandReplyFromReader(c,&aux) == REDIS_ERR)
return REDIS_ERR;
/* For the blocking context, flush output buffer and read reply */
if (aux == NULL && c->flags & REDIS_BLOCK) {
/* Write until done */
do {
if (redisBufferWrite(c,&wdone) == REDIS_ERR)
return REDIS_ERR;
} while (!wdone);
/* Read until there is a reply */
do {
if (redisBufferRead(c) == REDIS_ERR)
return REDIS_ERR;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (redisNextInBandReplyFromReader(c,&aux) == REDIS_ERR)
return REDIS_ERR;
} while (aux == NULL);
}
/* Set reply or free it if we were passed NULL */
if (reply != NULL) {
*reply = aux;
} else {
freeReplyObject(aux);
}
return REDIS_OK;
}
/* Helper function for the redisAppendCommand* family of functions.
*
* Write a formatted command to the output buffer. When this family
* is used, you need to call redisGetReply yourself to retrieve
* the reply (or replies in pub/sub).
*/
int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
hisds newbuf;
newbuf = hi_sdscatlen(c->obuf,cmd,len);
if (newbuf == NULL) {
__redisSetError(c,REDIS_ERR_OOM,"Out of memory");
return REDIS_ERR;
}
c->obuf = newbuf;
return REDIS_OK;
}
int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
return REDIS_ERR;
}
return REDIS_OK;
}
int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
char *cmd;
int len;
len = redisvFormatCommand(&cmd,format,ap);
if (len == -1) {
__redisSetError(c,REDIS_ERR_OOM,"Out of memory");
return REDIS_ERR;
} else if (len == -2) {
__redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
return REDIS_ERR;
}
if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
hi_free(cmd);
return REDIS_ERR;
}
hi_free(cmd);
return REDIS_OK;
}
int redisAppendCommand(redisContext *c, const char *format, ...) {
va_list ap;
int ret;
va_start(ap,format);
ret = redisvAppendCommand(c,format,ap);
va_end(ap);
return ret;
}
int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
hisds cmd;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
long long len;
len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
if (len == -1) {
__redisSetError(c,REDIS_ERR_OOM,"Out of memory");
return REDIS_ERR;
}
if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
hi_sdsfree(cmd);
return REDIS_ERR;
}
hi_sdsfree(cmd);
return REDIS_OK;
}
/* Helper function for the redisCommand* family of functions.
*
* Write a formatted command to the output buffer. If the given context is
* blocking, immediately read the reply into the "reply" pointer. When the
* context is non-blocking, the "reply" pointer will not be used and the
* command is simply appended to the write buffer.
*
* Returns the reply when a reply was successfully retrieved. Returns NULL
* otherwise. When NULL is returned in a blocking context, the error field
* in the context will be set.
*/
static void *__redisBlockForReply(redisContext *c) {
void *reply;
if (c->flags & REDIS_BLOCK) {
if (redisGetReply(c,&reply) != REDIS_OK)
return NULL;
return reply;
}
return NULL;
}
void *redisvCommand(redisContext *c, const char *format, va_list ap) {
if (redisvAppendCommand(c,format,ap) != REDIS_OK)
return NULL;
return __redisBlockForReply(c);
}
void *redisCommand(redisContext *c, const char *format, ...) {
va_list ap;
va_start(ap,format);
void *reply = redisvCommand(c,format,ap);
va_end(ap);
return reply;
}
void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
return NULL;
return __redisBlockForReply(c);
}