2020-08-06 15:41:58 -04:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
|
|
* Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail 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>
|
|
|
|
#ifndef _MSC_VER
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#endif
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
#include "alloc.h"
|
|
|
|
#include "read.h"
|
|
|
|
#include "sds.h"
|
|
|
|
#include "win32.h"
|
|
|
|
|
|
|
|
/* Initial size of our nested reply stack and how much we grow it when needd */
|
|
|
|
#define REDIS_READER_STACK_SIZE 9
|
|
|
|
|
|
|
|
static void __redisReaderSetError(redisReader *r, int type, const char *str) {
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
if (r->reply != NULL && r->fn && r->fn->freeObject) {
|
|
|
|
r->fn->freeObject(r->reply);
|
|
|
|
r->reply = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear input buffer on errors. */
|
2020-08-15 15:24:31 -04:00
|
|
|
hi_sdsfree(r->buf);
|
2020-08-06 15:41:58 -04:00
|
|
|
r->buf = NULL;
|
|
|
|
r->pos = r->len = 0;
|
|
|
|
|
|
|
|
/* Reset task stack. */
|
|
|
|
r->ridx = -1;
|
|
|
|
|
|
|
|
/* Set error. */
|
|
|
|
r->err = type;
|
|
|
|
len = strlen(str);
|
|
|
|
len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
|
|
|
|
memcpy(r->errstr,str,len);
|
|
|
|
r->errstr[len] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t chrtos(char *buf, size_t size, char byte) {
|
|
|
|
size_t len = 0;
|
|
|
|
|
|
|
|
switch(byte) {
|
|
|
|
case '\\':
|
|
|
|
case '"':
|
|
|
|
len = snprintf(buf,size,"\"\\%c\"",byte);
|
|
|
|
break;
|
|
|
|
case '\n': len = snprintf(buf,size,"\"\\n\""); break;
|
|
|
|
case '\r': len = snprintf(buf,size,"\"\\r\""); break;
|
|
|
|
case '\t': len = snprintf(buf,size,"\"\\t\""); break;
|
|
|
|
case '\a': len = snprintf(buf,size,"\"\\a\""); break;
|
|
|
|
case '\b': len = snprintf(buf,size,"\"\\b\""); break;
|
|
|
|
default:
|
|
|
|
if (isprint(byte))
|
|
|
|
len = snprintf(buf,size,"\"%c\"",byte);
|
|
|
|
else
|
|
|
|
len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
|
|
|
|
char cbuf[8], sbuf[128];
|
|
|
|
|
|
|
|
chrtos(cbuf,sizeof(cbuf),byte);
|
|
|
|
snprintf(sbuf,sizeof(sbuf),
|
|
|
|
"Protocol error, got %s as reply type byte", cbuf);
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __redisReaderSetErrorOOM(redisReader *r) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *readBytes(redisReader *r, unsigned int bytes) {
|
|
|
|
char *p;
|
|
|
|
if (r->len-r->pos >= bytes) {
|
|
|
|
p = r->buf+r->pos;
|
|
|
|
r->pos += bytes;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find pointer to \r\n. */
|
|
|
|
static char *seekNewline(char *s, size_t len) {
|
2022-02-14 06:51:42 -05:00
|
|
|
char *ret;
|
|
|
|
|
|
|
|
/* We cannot match with fewer than 2 bytes */
|
|
|
|
if (len < 2)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Search up to len - 1 characters */
|
|
|
|
len--;
|
|
|
|
|
|
|
|
/* Look for the \r */
|
|
|
|
while ((ret = memchr(s, '\r', len)) != NULL) {
|
|
|
|
if (ret[1] == '\n') {
|
|
|
|
/* Found. */
|
|
|
|
break;
|
2020-08-06 15:41:58 -04:00
|
|
|
}
|
2022-02-14 06:51:42 -05:00
|
|
|
/* Continue searching. */
|
|
|
|
ret++;
|
|
|
|
len -= ret - s;
|
|
|
|
s = ret;
|
2020-08-06 15:41:58 -04:00
|
|
|
}
|
2022-02-14 06:51:42 -05:00
|
|
|
|
|
|
|
return ret;
|
2020-08-06 15:41:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert a string into a long long. Returns REDIS_OK if the string could be
|
|
|
|
* parsed into a (non-overflowing) long long, REDIS_ERR otherwise. The value
|
|
|
|
* will be set to the parsed value when appropriate.
|
|
|
|
*
|
|
|
|
* Note that this function demands that the string strictly represents
|
|
|
|
* a long long: no spaces or other characters before or after the string
|
|
|
|
* representing the number are accepted, nor zeroes at the start if not
|
|
|
|
* for the string "0" representing the zero number.
|
|
|
|
*
|
|
|
|
* Because of its strictness, it is safe to use this function to check if
|
|
|
|
* you can convert a string into a long long, and obtain back the string
|
|
|
|
* from the number without any loss in the string representation. */
|
|
|
|
static int string2ll(const char *s, size_t slen, long long *value) {
|
|
|
|
const char *p = s;
|
|
|
|
size_t plen = 0;
|
|
|
|
int negative = 0;
|
|
|
|
unsigned long long v;
|
|
|
|
|
|
|
|
if (plen == slen)
|
|
|
|
return REDIS_ERR;
|
|
|
|
|
|
|
|
/* Special case: first and only digit is 0. */
|
|
|
|
if (slen == 1 && p[0] == '0') {
|
|
|
|
if (value != NULL) *value = 0;
|
|
|
|
return REDIS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p[0] == '-') {
|
|
|
|
negative = 1;
|
|
|
|
p++; plen++;
|
|
|
|
|
|
|
|
/* Abort on only a negative sign. */
|
|
|
|
if (plen == slen)
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First digit should be 1-9, otherwise the string should just be 0. */
|
|
|
|
if (p[0] >= '1' && p[0] <= '9') {
|
|
|
|
v = p[0]-'0';
|
|
|
|
p++; plen++;
|
|
|
|
} else if (p[0] == '0' && slen == 1) {
|
|
|
|
*value = 0;
|
|
|
|
return REDIS_OK;
|
|
|
|
} else {
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (plen < slen && p[0] >= '0' && p[0] <= '9') {
|
|
|
|
if (v > (ULLONG_MAX / 10)) /* Overflow. */
|
|
|
|
return REDIS_ERR;
|
|
|
|
v *= 10;
|
|
|
|
|
|
|
|
if (v > (ULLONG_MAX - (p[0]-'0'))) /* Overflow. */
|
|
|
|
return REDIS_ERR;
|
|
|
|
v += p[0]-'0';
|
|
|
|
|
|
|
|
p++; plen++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return if not all bytes were used. */
|
|
|
|
if (plen < slen)
|
|
|
|
return REDIS_ERR;
|
|
|
|
|
|
|
|
if (negative) {
|
|
|
|
if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
|
|
|
|
return REDIS_ERR;
|
|
|
|
if (value != NULL) *value = -v;
|
|
|
|
} else {
|
|
|
|
if (v > LLONG_MAX) /* Overflow. */
|
|
|
|
return REDIS_ERR;
|
|
|
|
if (value != NULL) *value = v;
|
|
|
|
}
|
|
|
|
return REDIS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *readLine(redisReader *r, int *_len) {
|
|
|
|
char *p, *s;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
p = r->buf+r->pos;
|
|
|
|
s = seekNewline(p,(r->len-r->pos));
|
|
|
|
if (s != NULL) {
|
|
|
|
len = s-(r->buf+r->pos);
|
|
|
|
r->pos += len+2; /* skip \r\n */
|
|
|
|
if (_len) *_len = len;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void moveToNextTask(redisReader *r) {
|
|
|
|
redisReadTask *cur, *prv;
|
|
|
|
while (r->ridx >= 0) {
|
|
|
|
/* Return a.s.a.p. when the stack is now empty. */
|
|
|
|
if (r->ridx == 0) {
|
|
|
|
r->ridx--;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cur = r->task[r->ridx];
|
|
|
|
prv = r->task[r->ridx-1];
|
|
|
|
assert(prv->type == REDIS_REPLY_ARRAY ||
|
|
|
|
prv->type == REDIS_REPLY_MAP ||
|
|
|
|
prv->type == REDIS_REPLY_SET ||
|
|
|
|
prv->type == REDIS_REPLY_PUSH);
|
|
|
|
if (cur->idx == prv->elements-1) {
|
|
|
|
r->ridx--;
|
|
|
|
} else {
|
|
|
|
/* Reset the type because the next item can be anything */
|
|
|
|
assert(cur->idx < prv->elements);
|
|
|
|
cur->type = -1;
|
|
|
|
cur->elements = -1;
|
|
|
|
cur->idx++;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int processLineItem(redisReader *r) {
|
|
|
|
redisReadTask *cur = r->task[r->ridx];
|
|
|
|
void *obj;
|
|
|
|
char *p;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if ((p = readLine(r,&len)) != NULL) {
|
|
|
|
if (cur->type == REDIS_REPLY_INTEGER) {
|
2022-02-14 06:51:42 -05:00
|
|
|
long long v;
|
|
|
|
|
|
|
|
if (string2ll(p, len, &v) == REDIS_ERR) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad integer value");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
2020-08-06 15:41:58 -04:00
|
|
|
if (r->fn && r->fn->createInteger) {
|
|
|
|
obj = r->fn->createInteger(cur,v);
|
|
|
|
} else {
|
|
|
|
obj = (void*)REDIS_REPLY_INTEGER;
|
|
|
|
}
|
|
|
|
} else if (cur->type == REDIS_REPLY_DOUBLE) {
|
2022-02-14 06:51:42 -05:00
|
|
|
char buf[326], *eptr;
|
|
|
|
double d;
|
2020-08-06 15:41:58 -04:00
|
|
|
|
2022-02-14 06:51:42 -05:00
|
|
|
if ((size_t)len >= sizeof(buf)) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Double value is too large");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buf,p,len);
|
|
|
|
buf[len] = '\0';
|
|
|
|
|
|
|
|
if (len == 3 && strcasecmp(buf,"inf") == 0) {
|
|
|
|
d = INFINITY; /* Positive infinite. */
|
|
|
|
} else if (len == 4 && strcasecmp(buf,"-inf") == 0) {
|
|
|
|
d = -INFINITY; /* Negative infinite. */
|
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0
b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188)
3fa9b6944 Add RedisModule adapter (#1182)
d13c091e9 Fix wincrypt symbols conflict
5d84c8cfd Add a test ensuring we don't clobber connection error.
3f95fcdae Don't attempt to set a timeout if we are in an error state.
aacb84b8d Fix typo in makefile.
563b062e3 Accept -nan per the RESP3 spec recommendation.
04c1b5b02 Fix colliding option values
4ca8e73f6 Rework searching for openssl
cd208812f Attempt to find the correct path for openssl.
011f7093c Allow specifying the keepalive interval
e9243d4f7 Cmake static or shared (#1160)
1cbd5bc76 Write a version file for the CMake package (#1165)
6f5bae8c6 fix typo
acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS
97fcf0fd1 Add sdevent adapter
ccff093bc Bump dev version for the next release cycle.
c14775b4e Prepare for v1.1.0 GA
f0bdf8405 Add support for nan in RESP3 double (#1133)
991b0b0b3 Add an example that calls redisCommandArgv (#1140)
a36686f84 CI updates (#1139)
8ad4985e9 fix flag reference
7583ebb1b Make freeing a NULL redisAsyncContext a no op.
2c53dea7f Update version in dev branch.
f063370ed Prepare for v1.1.0-rc1
2b069573a CI fixes in preparation of release
e1e9eb40d Add author information to release-drafter template.
afc29ee1a Update for mingw cross compile
ceb8a8815 fixed cpp build error with adapters/libhv.h
3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124)
c245df9fb CMake corrections for building on Windows (#1122)
9c338a598 Fix PUSH handler tests for Redis >= 7.0.5
6d5c3ee74 Install on windows fixes (#1117)
68b29e1ad Add timeout support to libhv adapter. (#1109)
722e3409c Additional include directory given by pkg-config (#1118)
bd9ccb8c4 Use __attribute__ when building with clang on windows
5392adc26 set default SSL certificate directory
560e66486 Minor refactor
d756f68a5 Add libhv example to our standard Makefile
a66916719 Add adapters/libhv
855b48a81 Fix pkgconfig for hiredis_ssl
79ae5ffc6 Fix protocol error (#1106)
61b5b299f Use a windows specific keepalive function. (#1104)
fce8abc1c Introduce .close method for redisContextFuncs
cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101)
cc7c35ce6 Update documentation to explain redisConnectWithOptions.
bc8d837b7 fix heap-buffer-overflow (#957)
ca4a0e850 uvadapter: reduce number of uv_poll_start calls
35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest.
10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified
1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail
329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad
eaae7321c Polling adapter requires sockcompat.h
0a5fa3dde Regression test for off-by-one parsing error
9e174e8f7 Add do while(0) protection for macros
4ad99c69a Rework asSleep to be a generic millisleep function.
75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593)
c57cad658 CMake: remove dict.c form hiredis_sources
8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943)
77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject
9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix
810cc6104 Merge pull request #905 from sundb/master
df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix
0ed6cdec3 Fix some undefined behaviour
507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error
b044eaa6a Copy error to redisAsyncContext when finding subscribe cb
e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback
6a3e96ad2 Maintain backward compatibiliy withour onConnect callback.
e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner
17c8fe079 Merge pull request #931 from kristjanvalur/pr2
b808c0c20 Merge pull request #1083 from chayim/ck-drafter
367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting
71119a71d Make it possible to set SSL verify mode
dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs
c71116178 Improve example for SSL initialization in README.md
5c9b6b571 Release drafter
a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0`
0865c115b Merge pull request #1080 from Nordix/readme-corrections
f6cee7142 Fix README typos
06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version
7dd833d54 CI: bump macos runner version
f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect()
005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion
6ed060920 Add async regression test for issue #931
eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3
2ccef30f3 Add regression test for issue #945
4b901d44a Initial async tests
31c91408e Polling adapter and example
8a15f4d65 Merge pull request #1057 from orgads/static-name
902dd047f Merge pull request #1054 from kristjanvalur/pr08
c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4
2b115d56c Whitespace
1343988ce Fix typos
47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks
a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1
f246ee433 Whitespace, style
94c1985bd Use correct type for getsockopt()
5e002bc21 Support failed async connects on windows.
5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests
f4b6ed289 Fix tests so they work for Redis 7.0
95a0c1283 Merge pull request #1058 from orgads/win64
eedb37a65 Fix warnings on Win64
47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order
e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt
34211ad54 Merge pull request #1063 from redis/fix-windows-tests
9957af7e3 Whitelist hiredis repo path in cygwin
b455b3381 Handle push notifications before or after reply.
aed9ce446 Use official repository for redis package.
d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling
7c44a9d7e Merge pull request #1045 from Nordix/sds-updates
dd4bf9783 Use the same name for static and shared libraries
ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file
8310ad4f5 fix cmake version
7123b87f6 Handle any pipelined unsubscribe in async
b6fb548fc Ignore pubsub replies without a channel/pattern
00b82683b Handle overflows as errors instead of asserting
64062a1d4 Catch size_t overflows in sds.c
066c6de79 Use size_t/long to avoid truncation
c6657ef65 Merge branch 'redis:master' into master
50cdcab49 Fix potential fault at createDoubleObject
fd033e983 Remove semicolon after do-while in _EL_CLEANUP
664c415e7 Illumos test fixes, error message difference fot bad hostname test.
git-subtree-dir: deps/hiredis
git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
|
|
|
} else if ((len == 3 && strcasecmp(buf,"nan") == 0) ||
|
|
|
|
(len == 4 && strcasecmp(buf, "-nan") == 0)) {
|
|
|
|
d = NAN; /* nan. */
|
2022-02-14 06:51:42 -05:00
|
|
|
} else {
|
|
|
|
d = strtod((char*)buf,&eptr);
|
|
|
|
/* RESP3 only allows "inf", "-inf", and finite values, while
|
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0
b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188)
3fa9b6944 Add RedisModule adapter (#1182)
d13c091e9 Fix wincrypt symbols conflict
5d84c8cfd Add a test ensuring we don't clobber connection error.
3f95fcdae Don't attempt to set a timeout if we are in an error state.
aacb84b8d Fix typo in makefile.
563b062e3 Accept -nan per the RESP3 spec recommendation.
04c1b5b02 Fix colliding option values
4ca8e73f6 Rework searching for openssl
cd208812f Attempt to find the correct path for openssl.
011f7093c Allow specifying the keepalive interval
e9243d4f7 Cmake static or shared (#1160)
1cbd5bc76 Write a version file for the CMake package (#1165)
6f5bae8c6 fix typo
acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS
97fcf0fd1 Add sdevent adapter
ccff093bc Bump dev version for the next release cycle.
c14775b4e Prepare for v1.1.0 GA
f0bdf8405 Add support for nan in RESP3 double (#1133)
991b0b0b3 Add an example that calls redisCommandArgv (#1140)
a36686f84 CI updates (#1139)
8ad4985e9 fix flag reference
7583ebb1b Make freeing a NULL redisAsyncContext a no op.
2c53dea7f Update version in dev branch.
f063370ed Prepare for v1.1.0-rc1
2b069573a CI fixes in preparation of release
e1e9eb40d Add author information to release-drafter template.
afc29ee1a Update for mingw cross compile
ceb8a8815 fixed cpp build error with adapters/libhv.h
3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124)
c245df9fb CMake corrections for building on Windows (#1122)
9c338a598 Fix PUSH handler tests for Redis >= 7.0.5
6d5c3ee74 Install on windows fixes (#1117)
68b29e1ad Add timeout support to libhv adapter. (#1109)
722e3409c Additional include directory given by pkg-config (#1118)
bd9ccb8c4 Use __attribute__ when building with clang on windows
5392adc26 set default SSL certificate directory
560e66486 Minor refactor
d756f68a5 Add libhv example to our standard Makefile
a66916719 Add adapters/libhv
855b48a81 Fix pkgconfig for hiredis_ssl
79ae5ffc6 Fix protocol error (#1106)
61b5b299f Use a windows specific keepalive function. (#1104)
fce8abc1c Introduce .close method for redisContextFuncs
cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101)
cc7c35ce6 Update documentation to explain redisConnectWithOptions.
bc8d837b7 fix heap-buffer-overflow (#957)
ca4a0e850 uvadapter: reduce number of uv_poll_start calls
35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest.
10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified
1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail
329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad
eaae7321c Polling adapter requires sockcompat.h
0a5fa3dde Regression test for off-by-one parsing error
9e174e8f7 Add do while(0) protection for macros
4ad99c69a Rework asSleep to be a generic millisleep function.
75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593)
c57cad658 CMake: remove dict.c form hiredis_sources
8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943)
77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject
9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix
810cc6104 Merge pull request #905 from sundb/master
df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix
0ed6cdec3 Fix some undefined behaviour
507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error
b044eaa6a Copy error to redisAsyncContext when finding subscribe cb
e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback
6a3e96ad2 Maintain backward compatibiliy withour onConnect callback.
e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner
17c8fe079 Merge pull request #931 from kristjanvalur/pr2
b808c0c20 Merge pull request #1083 from chayim/ck-drafter
367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting
71119a71d Make it possible to set SSL verify mode
dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs
c71116178 Improve example for SSL initialization in README.md
5c9b6b571 Release drafter
a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0`
0865c115b Merge pull request #1080 from Nordix/readme-corrections
f6cee7142 Fix README typos
06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version
7dd833d54 CI: bump macos runner version
f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect()
005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion
6ed060920 Add async regression test for issue #931
eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3
2ccef30f3 Add regression test for issue #945
4b901d44a Initial async tests
31c91408e Polling adapter and example
8a15f4d65 Merge pull request #1057 from orgads/static-name
902dd047f Merge pull request #1054 from kristjanvalur/pr08
c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4
2b115d56c Whitespace
1343988ce Fix typos
47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks
a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1
f246ee433 Whitespace, style
94c1985bd Use correct type for getsockopt()
5e002bc21 Support failed async connects on windows.
5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests
f4b6ed289 Fix tests so they work for Redis 7.0
95a0c1283 Merge pull request #1058 from orgads/win64
eedb37a65 Fix warnings on Win64
47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order
e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt
34211ad54 Merge pull request #1063 from redis/fix-windows-tests
9957af7e3 Whitelist hiredis repo path in cygwin
b455b3381 Handle push notifications before or after reply.
aed9ce446 Use official repository for redis package.
d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling
7c44a9d7e Merge pull request #1045 from Nordix/sds-updates
dd4bf9783 Use the same name for static and shared libraries
ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file
8310ad4f5 fix cmake version
7123b87f6 Handle any pipelined unsubscribe in async
b6fb548fc Ignore pubsub replies without a channel/pattern
00b82683b Handle overflows as errors instead of asserting
64062a1d4 Catch size_t overflows in sds.c
066c6de79 Use size_t/long to avoid truncation
c6657ef65 Merge branch 'redis:master' into master
50cdcab49 Fix potential fault at createDoubleObject
fd033e983 Remove semicolon after do-while in _EL_CLEANUP
664c415e7 Illumos test fixes, error message difference fot bad hostname test.
git-subtree-dir: deps/hiredis
git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
|
|
|
* strtod() allows other variations on infinity,
|
|
|
|
* etc. We explicity handle our two allowed infinite cases and NaN
|
2022-02-14 06:51:42 -05:00
|
|
|
* above, so strtod() should only result in finite values. */
|
|
|
|
if (buf[0] == '\0' || eptr != &buf[len] || !isfinite(d)) {
|
2020-08-06 15:41:58 -04:00
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
2022-02-14 06:51:42 -05:00
|
|
|
"Bad double value");
|
2020-08-06 15:41:58 -04:00
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
2022-02-14 06:51:42 -05:00
|
|
|
}
|
2020-08-06 15:41:58 -04:00
|
|
|
|
2022-02-14 06:51:42 -05:00
|
|
|
if (r->fn && r->fn->createDouble) {
|
2020-08-06 15:41:58 -04:00
|
|
|
obj = r->fn->createDouble(cur,d,buf,len);
|
|
|
|
} else {
|
|
|
|
obj = (void*)REDIS_REPLY_DOUBLE;
|
|
|
|
}
|
|
|
|
} else if (cur->type == REDIS_REPLY_NIL) {
|
2022-02-14 06:51:42 -05:00
|
|
|
if (len != 0) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad nil value");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
2020-08-06 15:41:58 -04:00
|
|
|
if (r->fn && r->fn->createNil)
|
|
|
|
obj = r->fn->createNil(cur);
|
|
|
|
else
|
|
|
|
obj = (void*)REDIS_REPLY_NIL;
|
|
|
|
} else if (cur->type == REDIS_REPLY_BOOL) {
|
2022-02-14 06:51:42 -05:00
|
|
|
int bval;
|
|
|
|
|
|
|
|
if (len != 1 || !strchr("tTfF", p[0])) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad bool value");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
bval = p[0] == 't' || p[0] == 'T';
|
2020-08-06 15:41:58 -04:00
|
|
|
if (r->fn && r->fn->createBool)
|
|
|
|
obj = r->fn->createBool(cur,bval);
|
|
|
|
else
|
|
|
|
obj = (void*)REDIS_REPLY_BOOL;
|
2022-02-14 06:51:42 -05:00
|
|
|
} else if (cur->type == REDIS_REPLY_BIGNUM) {
|
|
|
|
/* Ensure all characters are decimal digits (with possible leading
|
|
|
|
* minus sign). */
|
|
|
|
for (int i = 0; i < len; i++) {
|
|
|
|
/* XXX Consider: Allow leading '+'? Error on leading '0's? */
|
|
|
|
if (i == 0 && p[0] == '-') continue;
|
|
|
|
if (p[i] < '0' || p[i] > '9') {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad bignum value");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (r->fn && r->fn->createString)
|
|
|
|
obj = r->fn->createString(cur,p,len);
|
|
|
|
else
|
|
|
|
obj = (void*)REDIS_REPLY_BIGNUM;
|
2020-08-06 15:41:58 -04:00
|
|
|
} else {
|
|
|
|
/* Type will be error or status. */
|
2022-02-14 06:51:42 -05:00
|
|
|
for (int i = 0; i < len; i++) {
|
|
|
|
if (p[i] == '\r' || p[i] == '\n') {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad simple string value");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
}
|
2020-08-06 15:41:58 -04:00
|
|
|
if (r->fn && r->fn->createString)
|
|
|
|
obj = r->fn->createString(cur,p,len);
|
|
|
|
else
|
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0
b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188)
3fa9b6944 Add RedisModule adapter (#1182)
d13c091e9 Fix wincrypt symbols conflict
5d84c8cfd Add a test ensuring we don't clobber connection error.
3f95fcdae Don't attempt to set a timeout if we are in an error state.
aacb84b8d Fix typo in makefile.
563b062e3 Accept -nan per the RESP3 spec recommendation.
04c1b5b02 Fix colliding option values
4ca8e73f6 Rework searching for openssl
cd208812f Attempt to find the correct path for openssl.
011f7093c Allow specifying the keepalive interval
e9243d4f7 Cmake static or shared (#1160)
1cbd5bc76 Write a version file for the CMake package (#1165)
6f5bae8c6 fix typo
acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS
97fcf0fd1 Add sdevent adapter
ccff093bc Bump dev version for the next release cycle.
c14775b4e Prepare for v1.1.0 GA
f0bdf8405 Add support for nan in RESP3 double (#1133)
991b0b0b3 Add an example that calls redisCommandArgv (#1140)
a36686f84 CI updates (#1139)
8ad4985e9 fix flag reference
7583ebb1b Make freeing a NULL redisAsyncContext a no op.
2c53dea7f Update version in dev branch.
f063370ed Prepare for v1.1.0-rc1
2b069573a CI fixes in preparation of release
e1e9eb40d Add author information to release-drafter template.
afc29ee1a Update for mingw cross compile
ceb8a8815 fixed cpp build error with adapters/libhv.h
3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124)
c245df9fb CMake corrections for building on Windows (#1122)
9c338a598 Fix PUSH handler tests for Redis >= 7.0.5
6d5c3ee74 Install on windows fixes (#1117)
68b29e1ad Add timeout support to libhv adapter. (#1109)
722e3409c Additional include directory given by pkg-config (#1118)
bd9ccb8c4 Use __attribute__ when building with clang on windows
5392adc26 set default SSL certificate directory
560e66486 Minor refactor
d756f68a5 Add libhv example to our standard Makefile
a66916719 Add adapters/libhv
855b48a81 Fix pkgconfig for hiredis_ssl
79ae5ffc6 Fix protocol error (#1106)
61b5b299f Use a windows specific keepalive function. (#1104)
fce8abc1c Introduce .close method for redisContextFuncs
cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101)
cc7c35ce6 Update documentation to explain redisConnectWithOptions.
bc8d837b7 fix heap-buffer-overflow (#957)
ca4a0e850 uvadapter: reduce number of uv_poll_start calls
35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest.
10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified
1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail
329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad
eaae7321c Polling adapter requires sockcompat.h
0a5fa3dde Regression test for off-by-one parsing error
9e174e8f7 Add do while(0) protection for macros
4ad99c69a Rework asSleep to be a generic millisleep function.
75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593)
c57cad658 CMake: remove dict.c form hiredis_sources
8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943)
77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject
9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix
810cc6104 Merge pull request #905 from sundb/master
df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix
0ed6cdec3 Fix some undefined behaviour
507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error
b044eaa6a Copy error to redisAsyncContext when finding subscribe cb
e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback
6a3e96ad2 Maintain backward compatibiliy withour onConnect callback.
e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner
17c8fe079 Merge pull request #931 from kristjanvalur/pr2
b808c0c20 Merge pull request #1083 from chayim/ck-drafter
367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting
71119a71d Make it possible to set SSL verify mode
dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs
c71116178 Improve example for SSL initialization in README.md
5c9b6b571 Release drafter
a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0`
0865c115b Merge pull request #1080 from Nordix/readme-corrections
f6cee7142 Fix README typos
06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version
7dd833d54 CI: bump macos runner version
f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect()
005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion
6ed060920 Add async regression test for issue #931
eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3
2ccef30f3 Add regression test for issue #945
4b901d44a Initial async tests
31c91408e Polling adapter and example
8a15f4d65 Merge pull request #1057 from orgads/static-name
902dd047f Merge pull request #1054 from kristjanvalur/pr08
c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4
2b115d56c Whitespace
1343988ce Fix typos
47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks
a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1
f246ee433 Whitespace, style
94c1985bd Use correct type for getsockopt()
5e002bc21 Support failed async connects on windows.
5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests
f4b6ed289 Fix tests so they work for Redis 7.0
95a0c1283 Merge pull request #1058 from orgads/win64
eedb37a65 Fix warnings on Win64
47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order
e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt
34211ad54 Merge pull request #1063 from redis/fix-windows-tests
9957af7e3 Whitelist hiredis repo path in cygwin
b455b3381 Handle push notifications before or after reply.
aed9ce446 Use official repository for redis package.
d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling
7c44a9d7e Merge pull request #1045 from Nordix/sds-updates
dd4bf9783 Use the same name for static and shared libraries
ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file
8310ad4f5 fix cmake version
7123b87f6 Handle any pipelined unsubscribe in async
b6fb548fc Ignore pubsub replies without a channel/pattern
00b82683b Handle overflows as errors instead of asserting
64062a1d4 Catch size_t overflows in sds.c
066c6de79 Use size_t/long to avoid truncation
c6657ef65 Merge branch 'redis:master' into master
50cdcab49 Fix potential fault at createDoubleObject
fd033e983 Remove semicolon after do-while in _EL_CLEANUP
664c415e7 Illumos test fixes, error message difference fot bad hostname test.
git-subtree-dir: deps/hiredis
git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
|
|
|
obj = (void*)(uintptr_t)(cur->type);
|
2020-08-06 15:41:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (obj == NULL) {
|
|
|
|
__redisReaderSetErrorOOM(r);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set reply if this is the root object. */
|
|
|
|
if (r->ridx == 0) r->reply = obj;
|
|
|
|
moveToNextTask(r);
|
|
|
|
return REDIS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int processBulkItem(redisReader *r) {
|
|
|
|
redisReadTask *cur = r->task[r->ridx];
|
|
|
|
void *obj = NULL;
|
|
|
|
char *p, *s;
|
|
|
|
long long len;
|
|
|
|
unsigned long bytelen;
|
|
|
|
int success = 0;
|
|
|
|
|
|
|
|
p = r->buf+r->pos;
|
|
|
|
s = seekNewline(p,r->len-r->pos);
|
|
|
|
if (s != NULL) {
|
|
|
|
p = r->buf+r->pos;
|
|
|
|
bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
|
|
|
|
|
|
|
|
if (string2ll(p, bytelen - 2, &len) == REDIS_ERR) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad bulk string length");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len < -1 || (LLONG_MAX > SIZE_MAX && len > (long long)SIZE_MAX)) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bulk string length out of range");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len == -1) {
|
|
|
|
/* The nil object can always be created. */
|
|
|
|
if (r->fn && r->fn->createNil)
|
|
|
|
obj = r->fn->createNil(cur);
|
|
|
|
else
|
|
|
|
obj = (void*)REDIS_REPLY_NIL;
|
|
|
|
success = 1;
|
|
|
|
} else {
|
|
|
|
/* Only continue when the buffer contains the entire bulk item. */
|
|
|
|
bytelen += len+2; /* include \r\n */
|
|
|
|
if (r->pos+bytelen <= r->len) {
|
|
|
|
if ((cur->type == REDIS_REPLY_VERB && len < 4) ||
|
|
|
|
(cur->type == REDIS_REPLY_VERB && s[5] != ':'))
|
|
|
|
{
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Verbatim string 4 bytes of content type are "
|
|
|
|
"missing or incorrectly encoded.");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
if (r->fn && r->fn->createString)
|
|
|
|
obj = r->fn->createString(cur,s+2,len);
|
|
|
|
else
|
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0
b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188)
3fa9b6944 Add RedisModule adapter (#1182)
d13c091e9 Fix wincrypt symbols conflict
5d84c8cfd Add a test ensuring we don't clobber connection error.
3f95fcdae Don't attempt to set a timeout if we are in an error state.
aacb84b8d Fix typo in makefile.
563b062e3 Accept -nan per the RESP3 spec recommendation.
04c1b5b02 Fix colliding option values
4ca8e73f6 Rework searching for openssl
cd208812f Attempt to find the correct path for openssl.
011f7093c Allow specifying the keepalive interval
e9243d4f7 Cmake static or shared (#1160)
1cbd5bc76 Write a version file for the CMake package (#1165)
6f5bae8c6 fix typo
acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS
97fcf0fd1 Add sdevent adapter
ccff093bc Bump dev version for the next release cycle.
c14775b4e Prepare for v1.1.0 GA
f0bdf8405 Add support for nan in RESP3 double (#1133)
991b0b0b3 Add an example that calls redisCommandArgv (#1140)
a36686f84 CI updates (#1139)
8ad4985e9 fix flag reference
7583ebb1b Make freeing a NULL redisAsyncContext a no op.
2c53dea7f Update version in dev branch.
f063370ed Prepare for v1.1.0-rc1
2b069573a CI fixes in preparation of release
e1e9eb40d Add author information to release-drafter template.
afc29ee1a Update for mingw cross compile
ceb8a8815 fixed cpp build error with adapters/libhv.h
3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124)
c245df9fb CMake corrections for building on Windows (#1122)
9c338a598 Fix PUSH handler tests for Redis >= 7.0.5
6d5c3ee74 Install on windows fixes (#1117)
68b29e1ad Add timeout support to libhv adapter. (#1109)
722e3409c Additional include directory given by pkg-config (#1118)
bd9ccb8c4 Use __attribute__ when building with clang on windows
5392adc26 set default SSL certificate directory
560e66486 Minor refactor
d756f68a5 Add libhv example to our standard Makefile
a66916719 Add adapters/libhv
855b48a81 Fix pkgconfig for hiredis_ssl
79ae5ffc6 Fix protocol error (#1106)
61b5b299f Use a windows specific keepalive function. (#1104)
fce8abc1c Introduce .close method for redisContextFuncs
cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101)
cc7c35ce6 Update documentation to explain redisConnectWithOptions.
bc8d837b7 fix heap-buffer-overflow (#957)
ca4a0e850 uvadapter: reduce number of uv_poll_start calls
35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest.
10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified
1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail
329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad
eaae7321c Polling adapter requires sockcompat.h
0a5fa3dde Regression test for off-by-one parsing error
9e174e8f7 Add do while(0) protection for macros
4ad99c69a Rework asSleep to be a generic millisleep function.
75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593)
c57cad658 CMake: remove dict.c form hiredis_sources
8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943)
77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject
9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix
810cc6104 Merge pull request #905 from sundb/master
df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix
0ed6cdec3 Fix some undefined behaviour
507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error
b044eaa6a Copy error to redisAsyncContext when finding subscribe cb
e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback
6a3e96ad2 Maintain backward compatibiliy withour onConnect callback.
e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner
17c8fe079 Merge pull request #931 from kristjanvalur/pr2
b808c0c20 Merge pull request #1083 from chayim/ck-drafter
367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting
71119a71d Make it possible to set SSL verify mode
dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs
c71116178 Improve example for SSL initialization in README.md
5c9b6b571 Release drafter
a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0`
0865c115b Merge pull request #1080 from Nordix/readme-corrections
f6cee7142 Fix README typos
06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version
7dd833d54 CI: bump macos runner version
f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect()
005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion
6ed060920 Add async regression test for issue #931
eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3
2ccef30f3 Add regression test for issue #945
4b901d44a Initial async tests
31c91408e Polling adapter and example
8a15f4d65 Merge pull request #1057 from orgads/static-name
902dd047f Merge pull request #1054 from kristjanvalur/pr08
c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4
2b115d56c Whitespace
1343988ce Fix typos
47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks
a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1
f246ee433 Whitespace, style
94c1985bd Use correct type for getsockopt()
5e002bc21 Support failed async connects on windows.
5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests
f4b6ed289 Fix tests so they work for Redis 7.0
95a0c1283 Merge pull request #1058 from orgads/win64
eedb37a65 Fix warnings on Win64
47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order
e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt
34211ad54 Merge pull request #1063 from redis/fix-windows-tests
9957af7e3 Whitelist hiredis repo path in cygwin
b455b3381 Handle push notifications before or after reply.
aed9ce446 Use official repository for redis package.
d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling
7c44a9d7e Merge pull request #1045 from Nordix/sds-updates
dd4bf9783 Use the same name for static and shared libraries
ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file
8310ad4f5 fix cmake version
7123b87f6 Handle any pipelined unsubscribe in async
b6fb548fc Ignore pubsub replies without a channel/pattern
00b82683b Handle overflows as errors instead of asserting
64062a1d4 Catch size_t overflows in sds.c
066c6de79 Use size_t/long to avoid truncation
c6657ef65 Merge branch 'redis:master' into master
50cdcab49 Fix potential fault at createDoubleObject
fd033e983 Remove semicolon after do-while in _EL_CLEANUP
664c415e7 Illumos test fixes, error message difference fot bad hostname test.
git-subtree-dir: deps/hiredis
git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
|
|
|
obj = (void*)(uintptr_t)cur->type;
|
2020-08-06 15:41:58 -04:00
|
|
|
success = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Proceed when obj was created. */
|
|
|
|
if (success) {
|
|
|
|
if (obj == NULL) {
|
|
|
|
__redisReaderSetErrorOOM(r);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
r->pos += bytelen;
|
|
|
|
|
|
|
|
/* Set reply if this is the root object. */
|
|
|
|
if (r->ridx == 0) r->reply = obj;
|
|
|
|
moveToNextTask(r);
|
|
|
|
return REDIS_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int redisReaderGrow(redisReader *r) {
|
|
|
|
redisReadTask **aux;
|
|
|
|
int newlen;
|
|
|
|
|
|
|
|
/* Grow our stack size */
|
|
|
|
newlen = r->tasks + REDIS_READER_STACK_SIZE;
|
|
|
|
aux = hi_realloc(r->task, sizeof(*r->task) * newlen);
|
|
|
|
if (aux == NULL)
|
|
|
|
goto oom;
|
|
|
|
|
|
|
|
r->task = aux;
|
|
|
|
|
|
|
|
/* Allocate new tasks */
|
|
|
|
for (; r->tasks < newlen; r->tasks++) {
|
|
|
|
r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
|
|
|
|
if (r->task[r->tasks] == NULL)
|
|
|
|
goto oom;
|
|
|
|
}
|
|
|
|
|
|
|
|
return REDIS_OK;
|
|
|
|
oom:
|
|
|
|
__redisReaderSetErrorOOM(r);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Process the array, map and set types. */
|
|
|
|
static int processAggregateItem(redisReader *r) {
|
|
|
|
redisReadTask *cur = r->task[r->ridx];
|
|
|
|
void *obj;
|
|
|
|
char *p;
|
|
|
|
long long elements;
|
|
|
|
int root = 0, len;
|
|
|
|
|
|
|
|
if (r->ridx == r->tasks - 1) {
|
|
|
|
if (redisReaderGrow(r) == REDIS_ERR)
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((p = readLine(r,&len)) != NULL) {
|
|
|
|
if (string2ll(p, len, &elements) == REDIS_ERR) {
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Bad multi-bulk length");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
root = (r->ridx == 0);
|
|
|
|
|
|
|
|
if (elements < -1 || (LLONG_MAX > SIZE_MAX && elements > SIZE_MAX) ||
|
|
|
|
(r->maxelements > 0 && elements > r->maxelements))
|
|
|
|
{
|
|
|
|
__redisReaderSetError(r,REDIS_ERR_PROTOCOL,
|
|
|
|
"Multi-bulk length out of range");
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elements == -1) {
|
|
|
|
if (r->fn && r->fn->createNil)
|
|
|
|
obj = r->fn->createNil(cur);
|
|
|
|
else
|
|
|
|
obj = (void*)REDIS_REPLY_NIL;
|
|
|
|
|
|
|
|
if (obj == NULL) {
|
|
|
|
__redisReaderSetErrorOOM(r);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
moveToNextTask(r);
|
|
|
|
} else {
|
|
|
|
if (cur->type == REDIS_REPLY_MAP) elements *= 2;
|
|
|
|
|
|
|
|
if (r->fn && r->fn->createArray)
|
|
|
|
obj = r->fn->createArray(cur,elements);
|
|
|
|
else
|
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0
b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188)
3fa9b6944 Add RedisModule adapter (#1182)
d13c091e9 Fix wincrypt symbols conflict
5d84c8cfd Add a test ensuring we don't clobber connection error.
3f95fcdae Don't attempt to set a timeout if we are in an error state.
aacb84b8d Fix typo in makefile.
563b062e3 Accept -nan per the RESP3 spec recommendation.
04c1b5b02 Fix colliding option values
4ca8e73f6 Rework searching for openssl
cd208812f Attempt to find the correct path for openssl.
011f7093c Allow specifying the keepalive interval
e9243d4f7 Cmake static or shared (#1160)
1cbd5bc76 Write a version file for the CMake package (#1165)
6f5bae8c6 fix typo
acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS
97fcf0fd1 Add sdevent adapter
ccff093bc Bump dev version for the next release cycle.
c14775b4e Prepare for v1.1.0 GA
f0bdf8405 Add support for nan in RESP3 double (#1133)
991b0b0b3 Add an example that calls redisCommandArgv (#1140)
a36686f84 CI updates (#1139)
8ad4985e9 fix flag reference
7583ebb1b Make freeing a NULL redisAsyncContext a no op.
2c53dea7f Update version in dev branch.
f063370ed Prepare for v1.1.0-rc1
2b069573a CI fixes in preparation of release
e1e9eb40d Add author information to release-drafter template.
afc29ee1a Update for mingw cross compile
ceb8a8815 fixed cpp build error with adapters/libhv.h
3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124)
c245df9fb CMake corrections for building on Windows (#1122)
9c338a598 Fix PUSH handler tests for Redis >= 7.0.5
6d5c3ee74 Install on windows fixes (#1117)
68b29e1ad Add timeout support to libhv adapter. (#1109)
722e3409c Additional include directory given by pkg-config (#1118)
bd9ccb8c4 Use __attribute__ when building with clang on windows
5392adc26 set default SSL certificate directory
560e66486 Minor refactor
d756f68a5 Add libhv example to our standard Makefile
a66916719 Add adapters/libhv
855b48a81 Fix pkgconfig for hiredis_ssl
79ae5ffc6 Fix protocol error (#1106)
61b5b299f Use a windows specific keepalive function. (#1104)
fce8abc1c Introduce .close method for redisContextFuncs
cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101)
cc7c35ce6 Update documentation to explain redisConnectWithOptions.
bc8d837b7 fix heap-buffer-overflow (#957)
ca4a0e850 uvadapter: reduce number of uv_poll_start calls
35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest.
10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified
1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail
329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad
eaae7321c Polling adapter requires sockcompat.h
0a5fa3dde Regression test for off-by-one parsing error
9e174e8f7 Add do while(0) protection for macros
4ad99c69a Rework asSleep to be a generic millisleep function.
75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593)
c57cad658 CMake: remove dict.c form hiredis_sources
8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943)
77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject
9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix
810cc6104 Merge pull request #905 from sundb/master
df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix
0ed6cdec3 Fix some undefined behaviour
507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error
b044eaa6a Copy error to redisAsyncContext when finding subscribe cb
e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback
6a3e96ad2 Maintain backward compatibiliy withour onConnect callback.
e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner
17c8fe079 Merge pull request #931 from kristjanvalur/pr2
b808c0c20 Merge pull request #1083 from chayim/ck-drafter
367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting
71119a71d Make it possible to set SSL verify mode
dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs
c71116178 Improve example for SSL initialization in README.md
5c9b6b571 Release drafter
a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0`
0865c115b Merge pull request #1080 from Nordix/readme-corrections
f6cee7142 Fix README typos
06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version
7dd833d54 CI: bump macos runner version
f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect()
005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion
6ed060920 Add async regression test for issue #931
eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3
2ccef30f3 Add regression test for issue #945
4b901d44a Initial async tests
31c91408e Polling adapter and example
8a15f4d65 Merge pull request #1057 from orgads/static-name
902dd047f Merge pull request #1054 from kristjanvalur/pr08
c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4
2b115d56c Whitespace
1343988ce Fix typos
47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks
a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1
f246ee433 Whitespace, style
94c1985bd Use correct type for getsockopt()
5e002bc21 Support failed async connects on windows.
5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests
f4b6ed289 Fix tests so they work for Redis 7.0
95a0c1283 Merge pull request #1058 from orgads/win64
eedb37a65 Fix warnings on Win64
47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order
e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt
34211ad54 Merge pull request #1063 from redis/fix-windows-tests
9957af7e3 Whitelist hiredis repo path in cygwin
b455b3381 Handle push notifications before or after reply.
aed9ce446 Use official repository for redis package.
d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling
7c44a9d7e Merge pull request #1045 from Nordix/sds-updates
dd4bf9783 Use the same name for static and shared libraries
ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file
8310ad4f5 fix cmake version
7123b87f6 Handle any pipelined unsubscribe in async
b6fb548fc Ignore pubsub replies without a channel/pattern
00b82683b Handle overflows as errors instead of asserting
64062a1d4 Catch size_t overflows in sds.c
066c6de79 Use size_t/long to avoid truncation
c6657ef65 Merge branch 'redis:master' into master
50cdcab49 Fix potential fault at createDoubleObject
fd033e983 Remove semicolon after do-while in _EL_CLEANUP
664c415e7 Illumos test fixes, error message difference fot bad hostname test.
git-subtree-dir: deps/hiredis
git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
|
|
|
obj = (void*)(uintptr_t)cur->type;
|
2020-08-06 15:41:58 -04:00
|
|
|
|
|
|
|
if (obj == NULL) {
|
|
|
|
__redisReaderSetErrorOOM(r);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Modify task stack when there are more than 0 elements. */
|
|
|
|
if (elements > 0) {
|
|
|
|
cur->elements = elements;
|
|
|
|
cur->obj = obj;
|
|
|
|
r->ridx++;
|
|
|
|
r->task[r->ridx]->type = -1;
|
|
|
|
r->task[r->ridx]->elements = -1;
|
|
|
|
r->task[r->ridx]->idx = 0;
|
|
|
|
r->task[r->ridx]->obj = NULL;
|
|
|
|
r->task[r->ridx]->parent = cur;
|
|
|
|
r->task[r->ridx]->privdata = r->privdata;
|
|
|
|
} else {
|
|
|
|
moveToNextTask(r);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set reply if this is the root object. */
|
|
|
|
if (root) r->reply = obj;
|
|
|
|
return REDIS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int processItem(redisReader *r) {
|
|
|
|
redisReadTask *cur = r->task[r->ridx];
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
/* check if we need to read type */
|
|
|
|
if (cur->type < 0) {
|
|
|
|
if ((p = readBytes(r,1)) != NULL) {
|
|
|
|
switch (p[0]) {
|
|
|
|
case '-':
|
|
|
|
cur->type = REDIS_REPLY_ERROR;
|
|
|
|
break;
|
|
|
|
case '+':
|
|
|
|
cur->type = REDIS_REPLY_STATUS;
|
|
|
|
break;
|
|
|
|
case ':':
|
|
|
|
cur->type = REDIS_REPLY_INTEGER;
|
|
|
|
break;
|
|
|
|
case ',':
|
|
|
|
cur->type = REDIS_REPLY_DOUBLE;
|
|
|
|
break;
|
|
|
|
case '_':
|
|
|
|
cur->type = REDIS_REPLY_NIL;
|
|
|
|
break;
|
|
|
|
case '$':
|
|
|
|
cur->type = REDIS_REPLY_STRING;
|
|
|
|
break;
|
|
|
|
case '*':
|
|
|
|
cur->type = REDIS_REPLY_ARRAY;
|
|
|
|
break;
|
|
|
|
case '%':
|
|
|
|
cur->type = REDIS_REPLY_MAP;
|
|
|
|
break;
|
|
|
|
case '~':
|
|
|
|
cur->type = REDIS_REPLY_SET;
|
|
|
|
break;
|
|
|
|
case '#':
|
|
|
|
cur->type = REDIS_REPLY_BOOL;
|
|
|
|
break;
|
|
|
|
case '=':
|
|
|
|
cur->type = REDIS_REPLY_VERB;
|
|
|
|
break;
|
|
|
|
case '>':
|
|
|
|
cur->type = REDIS_REPLY_PUSH;
|
|
|
|
break;
|
2022-02-14 06:51:42 -05:00
|
|
|
case '(':
|
|
|
|
cur->type = REDIS_REPLY_BIGNUM;
|
|
|
|
break;
|
2020-08-06 15:41:58 -04:00
|
|
|
default:
|
|
|
|
__redisReaderSetErrorProtocolByte(r,*p);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* could not consume 1 byte */
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* process typed item */
|
|
|
|
switch(cur->type) {
|
|
|
|
case REDIS_REPLY_ERROR:
|
|
|
|
case REDIS_REPLY_STATUS:
|
|
|
|
case REDIS_REPLY_INTEGER:
|
|
|
|
case REDIS_REPLY_DOUBLE:
|
|
|
|
case REDIS_REPLY_NIL:
|
|
|
|
case REDIS_REPLY_BOOL:
|
2022-02-14 06:51:42 -05:00
|
|
|
case REDIS_REPLY_BIGNUM:
|
2020-08-06 15:41:58 -04:00
|
|
|
return processLineItem(r);
|
|
|
|
case REDIS_REPLY_STRING:
|
|
|
|
case REDIS_REPLY_VERB:
|
|
|
|
return processBulkItem(r);
|
|
|
|
case REDIS_REPLY_ARRAY:
|
|
|
|
case REDIS_REPLY_MAP:
|
|
|
|
case REDIS_REPLY_SET:
|
|
|
|
case REDIS_REPLY_PUSH:
|
|
|
|
return processAggregateItem(r);
|
|
|
|
default:
|
|
|
|
assert(NULL);
|
|
|
|
return REDIS_ERR; /* Avoid warning. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
|
|
|
|
redisReader *r;
|
|
|
|
|
|
|
|
r = hi_calloc(1,sizeof(redisReader));
|
|
|
|
if (r == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2020-08-15 15:24:31 -04:00
|
|
|
r->buf = hi_sdsempty();
|
2020-08-06 15:41:58 -04:00
|
|
|
if (r->buf == NULL)
|
|
|
|
goto oom;
|
|
|
|
|
|
|
|
r->task = hi_calloc(REDIS_READER_STACK_SIZE, sizeof(*r->task));
|
|
|
|
if (r->task == NULL)
|
|
|
|
goto oom;
|
|
|
|
|
|
|
|
for (; r->tasks < REDIS_READER_STACK_SIZE; r->tasks++) {
|
|
|
|
r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
|
|
|
|
if (r->task[r->tasks] == NULL)
|
|
|
|
goto oom;
|
|
|
|
}
|
|
|
|
|
|
|
|
r->fn = fn;
|
|
|
|
r->maxbuf = REDIS_READER_MAX_BUF;
|
|
|
|
r->maxelements = REDIS_READER_MAX_ARRAY_ELEMENTS;
|
|
|
|
r->ridx = -1;
|
|
|
|
|
|
|
|
return r;
|
|
|
|
oom:
|
|
|
|
redisReaderFree(r);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void redisReaderFree(redisReader *r) {
|
|
|
|
if (r == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (r->reply != NULL && r->fn && r->fn->freeObject)
|
|
|
|
r->fn->freeObject(r->reply);
|
|
|
|
|
|
|
|
if (r->task) {
|
|
|
|
/* We know r->task[i] is allocated if i < r->tasks */
|
|
|
|
for (int i = 0; i < r->tasks; i++) {
|
|
|
|
hi_free(r->task[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
hi_free(r->task);
|
|
|
|
}
|
|
|
|
|
2020-08-15 15:24:31 -04:00
|
|
|
hi_sdsfree(r->buf);
|
2020-08-06 15:41:58 -04:00
|
|
|
hi_free(r);
|
|
|
|
}
|
|
|
|
|
|
|
|
int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
|
2020-08-15 15:24:31 -04:00
|
|
|
hisds newbuf;
|
2020-08-06 15:41:58 -04:00
|
|
|
|
|
|
|
/* Return early when this reader is in an erroneous state. */
|
|
|
|
if (r->err)
|
|
|
|
return REDIS_ERR;
|
|
|
|
|
|
|
|
/* Copy the provided buffer. */
|
|
|
|
if (buf != NULL && len >= 1) {
|
|
|
|
/* Destroy internal buffer when it is empty and is quite large. */
|
2020-08-15 15:24:31 -04:00
|
|
|
if (r->len == 0 && r->maxbuf != 0 && hi_sdsavail(r->buf) > r->maxbuf) {
|
|
|
|
hi_sdsfree(r->buf);
|
|
|
|
r->buf = hi_sdsempty();
|
2020-08-06 15:41:58 -04:00
|
|
|
if (r->buf == 0) goto oom;
|
|
|
|
|
|
|
|
r->pos = 0;
|
|
|
|
}
|
|
|
|
|
2020-08-15 15:24:31 -04:00
|
|
|
newbuf = hi_sdscatlen(r->buf,buf,len);
|
2020-08-06 15:41:58 -04:00
|
|
|
if (newbuf == NULL) goto oom;
|
|
|
|
|
|
|
|
r->buf = newbuf;
|
2020-08-15 15:24:31 -04:00
|
|
|
r->len = hi_sdslen(r->buf);
|
2020-08-06 15:41:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return REDIS_OK;
|
|
|
|
oom:
|
|
|
|
__redisReaderSetErrorOOM(r);
|
|
|
|
return REDIS_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
int redisReaderGetReply(redisReader *r, void **reply) {
|
|
|
|
/* Default target pointer to NULL. */
|
|
|
|
if (reply != NULL)
|
|
|
|
*reply = NULL;
|
|
|
|
|
|
|
|
/* Return early when this reader is in an erroneous state. */
|
|
|
|
if (r->err)
|
|
|
|
return REDIS_ERR;
|
|
|
|
|
|
|
|
/* When the buffer is empty, there will never be a reply. */
|
|
|
|
if (r->len == 0)
|
|
|
|
return REDIS_OK;
|
|
|
|
|
|
|
|
/* Set first item to process when the stack is empty. */
|
|
|
|
if (r->ridx == -1) {
|
|
|
|
r->task[0]->type = -1;
|
|
|
|
r->task[0]->elements = -1;
|
|
|
|
r->task[0]->idx = -1;
|
|
|
|
r->task[0]->obj = NULL;
|
|
|
|
r->task[0]->parent = NULL;
|
|
|
|
r->task[0]->privdata = r->privdata;
|
|
|
|
r->ridx = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Process items in reply. */
|
|
|
|
while (r->ridx >= 0)
|
|
|
|
if (processItem(r) != REDIS_OK)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Return ASAP when an error occurred. */
|
|
|
|
if (r->err)
|
|
|
|
return REDIS_ERR;
|
|
|
|
|
|
|
|
/* Discard part of the buffer when we've consumed at least 1k, to avoid
|
|
|
|
* doing unnecessary calls to memmove() in sds.c. */
|
|
|
|
if (r->pos >= 1024) {
|
2020-08-15 15:24:31 -04:00
|
|
|
if (hi_sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR;
|
2020-08-06 15:41:58 -04:00
|
|
|
r->pos = 0;
|
2020-08-15 15:24:31 -04:00
|
|
|
r->len = hi_sdslen(r->buf);
|
2020-08-06 15:41:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Emit a reply when there is one. */
|
|
|
|
if (r->ridx == -1) {
|
|
|
|
if (reply != NULL) {
|
|
|
|
*reply = r->reply;
|
|
|
|
} else if (r->reply != NULL && r->fn && r->fn->freeObject) {
|
|
|
|
r->fn->freeObject(r->reply);
|
|
|
|
}
|
|
|
|
r->reply = NULL;
|
|
|
|
}
|
|
|
|
return REDIS_OK;
|
|
|
|
}
|