git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Fix double-free in ovsdb_jsonrpc_session_close().
[sliver-openvswitch.git]
/
ovsdb
/
jsonrpc-server.c
diff --git
a/ovsdb/jsonrpc-server.c
b/ovsdb/jsonrpc-server.c
index
1d0b0e3
..
6d07c45
100644
(file)
--- a/
ovsdb/jsonrpc-server.c
+++ b/
ovsdb/jsonrpc-server.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-386,7
+386,6
@@
ovsdb_jsonrpc_session_close(struct ovsdb_jsonrpc_session *s)
ovsdb_jsonrpc_session_unlock_all(s);
jsonrpc_session_close(s->js);
list_remove(&s->node);
ovsdb_jsonrpc_session_unlock_all(s);
jsonrpc_session_close(s->js);
list_remove(&s->node);
- ovsdb_session_destroy(&s->up);
s->remote->server->n_sessions--;
ovsdb_session_destroy(&s->up);
free(s);
s->remote->server->n_sessions--;
ovsdb_session_destroy(&s->up);
free(s);