diff options
author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 18:06:31 +0000 |
---|---|---|
committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 18:06:31 +0000 |
commit | 76dcd4921c512c591265041961f420ce967c1fb6 (patch) | |
tree | 6203bd072ec3a417b0b45e3dc672f6e8299e2483 /net.c | |
parent | 0ee50993ce7bd5e4e9d3729bcb4fc9f8567436ee (diff) |
Fix error handling in net_client_init() (Mark McLoughlin)
We weren't freeing the name string everywhere.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7154 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'net.c')
-rw-r--r-- | net.c | 26 |
1 files changed, 16 insertions, 10 deletions
@@ -1606,7 +1606,8 @@ int net_client_init(const char *device, const char *p) 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 @@ int net_client_init(const char *device, const char *p) 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 @@ int net_client_init(const char *device, const char *p) 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 @@ int net_client_init(const char *device, const char *p) 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 @@ int net_client_init(const char *device, const char *p) 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 @@ int net_client_init(const char *device, const char *p) 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 @@ int net_client_init(const char *device, const char *p) #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; |