mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

jsonrpc: Fix memory leak in jsonrpc_session_send() when not connected.

Browse Source 
Partial fix for bug #2373.
This commit is contained in:
Ben Pfaff
2010-01-12 10:51:30 -08:00
parent 9c8149dca0
commit 7b8dbc8d8f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/jsonrpc.c
View File

@@ -172,6 +172,7 @@ jsonrpc_log_msg(const struct jsonrpc *rpc, const char *title,
} }
} }
/* Always takes ownership of 'msg', regardless of success. */
int int
jsonrpc_send(struct jsonrpc *rpc, struct jsonrpc_msg *msg) jsonrpc_send(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
{ {
@@ -268,6 +269,7 @@ jsonrpc_recv_wait(struct jsonrpc *rpc)
} }
} }
/* Always takes ownership of 'msg', regardless of success. */
int int
jsonrpc_send_block(struct jsonrpc *rpc, struct jsonrpc_msg *msg) jsonrpc_send_block(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
{ {
@@ -304,6 +306,7 @@ jsonrpc_recv_block(struct jsonrpc *rpc, struct jsonrpc_msg **msgp)
} }
} }
/* Always takes ownership of 'request', regardless of success. */
int int
jsonrpc_transact_block(struct jsonrpc *rpc, struct jsonrpc_msg *request, jsonrpc_transact_block(struct jsonrpc *rpc, struct jsonrpc_msg *request,
struct jsonrpc_msg **replyp) struct jsonrpc_msg **replyp)
@@ -792,10 +795,16 @@ jsonrpc_session_get_name(const struct jsonrpc_session *s)
return reconnect_get_name(s->reconnect); return reconnect_get_name(s->reconnect);
} }
/* Always takes ownership of 'msg', regardless of success. */
int int
jsonrpc_session_send(struct jsonrpc_session *s, struct jsonrpc_msg *msg) jsonrpc_session_send(struct jsonrpc_session *s, struct jsonrpc_msg *msg)
{ {
return s->rpc ? jsonrpc_send(s->rpc, msg) : ENOTCONN; if (s->rpc) {
return jsonrpc_send(s->rpc, msg);
} else {
jsonrpc_msg_destroy(msg);
return ENOTCONN;
}
} }
struct jsonrpc_msg * struct jsonrpc_msg *