提交 489e14f2 编写于 作者: M Michal Privoznik 提交者: Stefan Berger

nwfilter: Initialize virNWFilterAddIpAddrForIfname return variable

Latest nwfilter patch ad6c67cf introduced uninitialized return
value. This was spotted by 4.6.2 gcc.
上级 aad764e1
......@@ -323,7 +323,7 @@ virNWFilterDeregisterLearnReq(int ifindex) {
static int
virNWFilterAddIpAddrForIfname(const char *ifname, char *addr)
{
int ret;
int ret = -1;
virNWFilterVarValuePtr val;
virMutexLock(&ipAddressMapLock);
......@@ -333,17 +333,21 @@ virNWFilterAddIpAddrForIfname(const char *ifname, char *addr)
val = virNWFilterVarValueCreateSimple(addr);
if (!val) {
virReportOOMError();
ret = -1;
goto err_exit;
goto cleanup;
}
ret = virNWFilterHashTablePut(ipAddressMap, ifname, val, 1);
/* FIXME: fix when return code of virNWFilterHashTablePut changes */
if (ret)
ret = -1;
goto cleanup;
} else {
if (virNWFilterVarValueAddValue(val, addr) < 0)
ret = -1;
ret = 0;
goto cleanup;
}
err_exit:
ret = 0;
cleanup:
virMutexUnlock(&ipAddressMapLock);
return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册