Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

lecp: fix format_scan function for numeric longer than 2 digits and negative numbers

Browse source
This commit is contained in:
DomB 2024-01-08 08:26:58 +01:00 • committed by Andy Green
parent 50ba61082d
commit f88792df37
2 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/misc/lecp.c
View file

@ -985,7 +985,7 @@ format_scan(const char *fmt)
} }
if (numeric) { if (numeric) {
if (*fmt >= '0' && *fmt <= '9') while (*fmt >= '0' && *fmt <= '9')
fmt++; fmt++;
numeric = 0; numeric = 0;
if (*fmt != '(') if (*fmt != '(')
@ -1119,6 +1119,7 @@ pop:
return count[0]; return count[0];
case '-':
case '0': case '0':
case '1': case '1':
case '2': case '2':

52
minimal-examples-lowlevel/api-tests/api-test-lecp/main.c
View file

@ -4477,7 +4477,11 @@ static const uint8_t
w26[] = { 0xF9, 0x3E, 0x00 }, w26[] = { 0xF9, 0x3E, 0x00 },
w27[] = { 0xFB, 0x3F, 0xF1, 0xF7, 0xCE, 0xD9, 0x16, 0x87, 0x2B }, w27[] = { 0xFB, 0x3F, 0xF1, 0xF7, 0xCE, 0xD9, 0x16, 0x87, 0x2B },
w28[] = { 0xA2, 0x61, 0x61, 0x01, 0x61, 0x62, 0x82, 0x02, 0x03 }, w28[] = { 0xA2, 0x61, 0x61, 0x01, 0x61, 0x62, 0x82, 0x02, 0x03 },
w29[] = { 0x7F, 0x65, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0xFF w29[] = { 0x7F, 0x65, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0xFF },
w30[] = { 0xA2, 0x63, 0x67, 0x68, 0x69, 0x18, 0x7B, 0x63, 0x6A, 0x6B, 0x6C, 0x02 },
w31[] = { 0x82, 0x18, 0x81, 0x19, 0x04, 0x00 },
w32[] = { 0xA2, 0x63, 0x67, 0x68, 0x69, 0x38, 0x7A, 0x63, 0x6A, 0x6B, 0x6C, 0x02 },
w33[] = { 0x82, 0x38, 0x80, 0x39, 0x03, 0xFF
} }
; ;
@ -4604,7 +4608,7 @@ int main(int argc, const char **argv)
{ {
int n, m, e = 0, logs = LLL_USER | LLL_ERR | LLL_WARN | LLL_NOTICE, int n, m, e = 0, logs = LLL_USER | LLL_ERR | LLL_WARN | LLL_NOTICE,
expected = (int)LWS_ARRAY_SIZE(cbor_tests) + expected = (int)LWS_ARRAY_SIZE(cbor_tests) +
29 /* <-- how many write tests */; 33 /* <-- how many write tests */;
struct lecp_ctx ctx; struct lecp_ctx ctx;
const char *p; const char *p;
@ -5000,6 +5004,50 @@ int main(int argc, const char **argv)
e++; e++;
} else } else
pass++; pass++;
lwsl_user("%s: test30\n", __func__);
lws_lec_setbuf(&ctx, buf, sizeof(buf));
if (lws_lec_printf(&ctx, "{'ghi':123,'jkl':2}") !=
LWS_LECPCTX_RET_FINISHED ||
ctx.used != sizeof(w30) || memcmp(w30, buf, ctx.used)) {
lwsl_hexdump_notice(ctx.start, ctx.used);
e++;
} else
pass++;
lwsl_user("%s: test31\n", __func__);
lws_lec_setbuf(&ctx, buf, sizeof(buf));
if (lws_lec_printf(&ctx, "[129,1024]") !=
LWS_LECPCTX_RET_FINISHED ||
ctx.used != sizeof(w31) || memcmp(w31, buf, ctx.used)) {
lwsl_hexdump_notice(ctx.start, ctx.used);
e++;
} else
pass++;
lwsl_user("%s: test32\n", __func__);
lws_lec_setbuf(&ctx, buf, sizeof(buf));
if (lws_lec_printf(&ctx, "{'ghi':-123,'jkl':2}") !=
LWS_LECPCTX_RET_FINISHED ||
ctx.used != sizeof(w32) || memcmp(w32, buf, ctx.used)) {
lwsl_hexdump_notice(ctx.start, ctx.used);
e++;
} else
pass++;
lwsl_user("%s: test33\n", __func__);
lws_lec_setbuf(&ctx, buf, sizeof(buf));
if (lws_lec_printf(&ctx, "[-129,-1024]") !=
LWS_LECPCTX_RET_FINISHED ||
ctx.used != sizeof(w33) || memcmp(w33, buf, ctx.used)) {
lwsl_hexdump_notice(ctx.start, ctx.used);
e++;
} else
pass++;
} }
if (e) if (e)