mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-24 02:59:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Allow NULL head in struct mg_rpc

Browse Source
This commit is contained in:
cpq 2022-08-19 15:07:50 +01:00
parent 2bf25a1406
commit fee6de6a7f
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mongoose.c
View File

@ -3580,7 +3580,7 @@ void mg_rpc_process(struct mg_rpc_req *r) {
int len, off = mg_json_get(r->frame, "$.method", &len);
if (off > 0 && r->frame.ptr[off] == '"') {
struct mg_str m = mg_str_n(&r->frame.ptr[off + 1], (size_t) len - 2);
struct mg_rpc *h = *(struct mg_rpc **) r->head;
struct mg_rpc *h = r->head == NULL ? NULL : *r->head;
while (h != NULL && !mg_match(m, h->method, NULL)) h = h->next;
if (h != NULL) {
r->rpc = h;

2
src/rpc.c
View File

@ -24,7 +24,7 @@ void mg_rpc_process(struct mg_rpc_req *r) {
int len, off = mg_json_get(r->frame, "$.method", &len);
if (off > 0 && r->frame.ptr[off] == '"') {
struct mg_str m = mg_str_n(&r->frame.ptr[off + 1], (size_t) len - 2);
struct mg_rpc *h = *(struct mg_rpc **) r->head;
struct mg_rpc *h = r->head == NULL ? NULL : *r->head;
while (h != NULL && !mg_match(m, h->method, NULL)) h = h->next;
if (h != NULL) {
r->rpc = h;

13
test/unit_test.c
View File

@ -2524,6 +2524,19 @@ static void test_rpc(void) {
mg_iobuf_free(&io);
}
{
const char *resp =
"{\"id\":true,\"error\":{\"code\":-32601,\"message\":\"foo not "
"found\"}}";
req.frame = mg_str("{\"id\": true,\"method\":\"foo\"}");
req.head = NULL;
mg_rpc_process(&req);
// MG_INFO(("-> %s", io.buf));
ASSERT(strcmp((char *) io.buf, resp) == 0);
mg_iobuf_free(&io);
req.head = &head;
}
{
const char *resp = "{\"error\":{\"code\":-32700,\"message\":\"haha\"}}";
req.frame = mg_str("haha");