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

Merge pull request #1765 from jameshilliard/rpc-add-calloc-null

Browse Source 
Fix null pointer dereference in mg_rpc_add()
This commit is contained in:
Sergey Lyubka 2022-09-25 23:22:57 +01:00 committed by GitHub
commit fb3b0ca6e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mongoose.c
View File

@ -3546,8 +3546,10 @@ void mg_mgr_init(struct mg_mgr *mgr) {
void mg_rpc_add(struct mg_rpc **head, struct mg_str method, void mg_rpc_add(struct mg_rpc **head, struct mg_str method,
void (*fn)(struct mg_rpc_req *), void *fn_data) { void (*fn)(struct mg_rpc_req *), void *fn_data) {
struct mg_rpc *rpc = (struct mg_rpc *) calloc(1, sizeof(*rpc)); struct mg_rpc *rpc = (struct mg_rpc *) calloc(1, sizeof(*rpc));
rpc->method = mg_strdup(method), rpc->fn = fn, rpc->fn_data = fn_data; if (rpc != NULL) {
rpc->next = *head, *head = rpc; rpc->method = mg_strdup(method), rpc->fn = fn, rpc->fn_data = fn_data;
rpc->next = *head, *head = rpc;
}
} }
void mg_rpc_del(struct mg_rpc **head, void (*fn)(struct mg_rpc_req *)) { void mg_rpc_del(struct mg_rpc **head, void (*fn)(struct mg_rpc_req *)) {

6
src/rpc.c
View File

@ -3,8 +3,10 @@
void mg_rpc_add(struct mg_rpc **head, struct mg_str method, void mg_rpc_add(struct mg_rpc **head, struct mg_str method,
void (*fn)(struct mg_rpc_req *), void *fn_data) { void (*fn)(struct mg_rpc_req *), void *fn_data) {
struct mg_rpc *rpc = (struct mg_rpc *) calloc(1, sizeof(*rpc)); struct mg_rpc *rpc = (struct mg_rpc *) calloc(1, sizeof(*rpc));
rpc->method = mg_strdup(method), rpc->fn = fn, rpc->fn_data = fn_data; if (rpc != NULL) {
rpc->next = *head, *head = rpc; rpc->method = mg_strdup(method), rpc->fn = fn, rpc->fn_data = fn_data;
rpc->next = *head, *head = rpc;
}
} }
void mg_rpc_del(struct mg_rpc **head, void (*fn)(struct mg_rpc_req *)) { void mg_rpc_del(struct mg_rpc **head, void (*fn)(struct mg_rpc_req *)) {