lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update sproto (#1720)

Browse Source 
Co-authored-by: zixun <lb151450@alibaba-inc.com>
This commit is contained in:
子熏
2023-03-21 21:37:03 +08:00
committed by GitHub
parent 1e45d4a9be
commit b9a5cec191
3 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lualib-src/sproto/sproto.c
View File

@@ -898,7 +898,7 @@ encode_array(sproto_callback cb, struct sproto_arg *args, uint8_t *data, int siz
buffer = encode_integer_array(cb,args,buffer,size, &noarray);
if (buffer == NULL)
return -1;
if (noarray) {
return 0;
}
@@ -1088,26 +1088,33 @@ expand64(uint32_t v) {
return value;
}
static int
decode_empty_array(sproto_callback cb, struct sproto_arg *args) {
// It's empty array, call cb with index == -1 to create the empty array.
args->index = -1;
args->value = NULL;
args->length = 0;
return cb(args);
}
static int
decode_array(sproto_callback cb, struct sproto_arg *args, uint8_t * stream) {
uint32_t sz = todword(stream);
int type = args->type;
int i;
if (sz == 0) {
// It's empty array, call cb with index == -1 to create the empty array.
args->index = -1;
args->value = NULL;
args->length = 0;
cb(args);
return 0;
}
return decode_empty_array(cb, args);
}
stream += SIZEOF_LENGTH;
switch (type) {
case SPROTO_TDOUBLE:
case SPROTO_TINTEGER: {
if (--sz == 0) {
// An empty array but with a len prefix
return decode_empty_array(cb, args);
}
int len = *stream;
++stream;
--sz;
if (len == SIZEOF_INT32) {
if (sz % SIZEOF_INT32 != 0)
return -1;