[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [7154] Fix error handling in net_client_init() (Mark McLoug
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [7154] Fix error handling in net_client_init() (Mark McLoughlin) |
Date: |
Fri, 17 Apr 2009 18:06:31 +0000 |
Revision: 7154
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7154
Author: aliguori
Date: 2009-04-17 18:06:31 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Fix error handling in net_client_init() (Mark McLoughlin)
We weren't freeing the name string everywhere.
Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
branches/stable_0_10/net.c
Modified: branches/stable_0_10/net.c
===================================================================
--- branches/stable_0_10/net.c 2009-04-17 18:06:27 UTC (rev 7153)
+++ branches/stable_0_10/net.c 2009-04-17 18:06:31 UTC (rev 7154)
@@ -1606,7 +1606,8 @@
if (idx == -1 || nb_nics >= MAX_NICS) {
fprintf(stderr, "Too Many NICs\n");
- return -1;
+ ret = -1;
+ goto out;
}
nd = &nd_table[idx];
macaddr = nd->macaddr;
@@ -1620,7 +1621,8 @@
if (get_param_value(buf, sizeof(buf), "macaddr", p)) {
if (parse_macaddr(macaddr, buf) < 0) {
fprintf(stderr, "invalid syntax for ethernet address\n");
- return -1;
+ ret = -1;
+ goto out;
}
}
if (get_param_value(buf, sizeof(buf), "model", p)) {
@@ -1660,8 +1662,9 @@
port = strtol(p, &devname, 10);
devname++;
if (port < 1 || port > 65535) {
- fprintf(stderr, "vmchannel wrong port number\n");
- return -1;
+ fprintf(stderr, "vmchannel wrong port number\n");
+ ret = -1;
+ goto out;
}
vmc = malloc(sizeof(struct VMChannel));
snprintf(name, 20, "vmchannel%ld", port);
@@ -1669,7 +1672,8 @@
if (!vmc->hd) {
fprintf(stderr, "qemu: could not open vmchannel device"
"'%s'\n", devname);
- return -1;
+ ret = -1;
+ goto out;
}
vmc->port = port;
slirp_add_exec(3, vmc->hd, 4, port);
@@ -1683,7 +1687,8 @@
char ifname[64];
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
fprintf(stderr, "tap: no interface name\n");
- return -1;
+ ret = -1;
+ goto out;
}
vlan->nb_host_devs++;
ret = tap_win32_init(vlan, device, name, ifname);
@@ -1730,7 +1735,8 @@
ret = net_socket_mcast_init(vlan, device, name, buf);
} else {
fprintf(stderr, "Unknown socket options: %s\n", p);
- return -1;
+ ret = -1;
+ goto out;
}
vlan->nb_host_devs++;
} else
@@ -1760,13 +1766,13 @@
#endif
{
fprintf(stderr, "Unknown network device: %s\n", device);
- if (name)
- free(name);
- return -1;
+ ret = -1;
+ goto out;
}
if (ret < 0) {
fprintf(stderr, "Could not initialize device '%s'\n", device);
}
+out:
if (name)
free(name);
return ret;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [7154] Fix error handling in net_client_init() (Mark McLoughlin),
Anthony Liguori <=