From 1638ff192b0e4b48e50986f6b5789ccf1da842bc Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 23 Apr 2012 13:22:10 -0700 Subject: [PATCH] Fix memory leaks. Found by valgrind. Reported-by: Ethan Jackson Signed-off-by: Ben Pfaff --- lib/netdev-vport.c | 3 ++- lib/route-table.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 92096e3f7..55209e4d1 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011 Nicira Networks. + * Copyright (c) 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -198,6 +198,7 @@ netdev_vport_destroy(struct netdev_dev *netdev_dev_) { struct netdev_dev_vport *netdev_dev = netdev_dev_vport_cast(netdev_dev_); + ofpbuf_delete(netdev_dev->options); route_table_unregister(); free(netdev_dev); } diff --git a/lib/route-table.c b/lib/route-table.c index 58c1b6015..8e54b2848 100644 --- a/lib/route-table.c +++ b/lib/route-table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Nicira Networks. + * Copyright (c) 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -246,6 +246,7 @@ route_table_reset(void) rtmsg->rtgen_family = AF_INET; nl_dump_start(&dump, rtnl_sock, &request); + ofpbuf_uninit(&request); while (nl_dump_next(&dump, &reply)) { struct route_table_msg msg; @@ -437,6 +438,8 @@ name_table_reset(void) rtmsg->rtgen_family = AF_INET; nl_dump_start(&dump, rtnl_sock, &request); + ofpbuf_uninit(&request); + while (nl_dump_next(&dump, &reply)) { struct rtnetlink_link_change change; -- 2.43.0