External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nwfilter: Fix possible segfault on sometimes consumed variable"

Browse Source 
This reverts commit 6209bb32e5.

This turns out to be the wrong adjustment
This commit is contained in:
John Ferlan 2017-09-28 15:13:46 -04:00
parent 513f0982f1
commit 039702174c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/conf/nwfilter_ipaddrmap.c
View File

@ -26,9 +26,7 @@
#include "internal.h"
#include "viralloc.h"
#include "virerror.h"
#include "virstring.h"
#include "datatypes.h"
#include "nwfilter_params.h"
#include "nwfilter_ipaddrmap.h"
@ -54,7 +52,6 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr)
{
int ret = -1;
virNWFilterVarValuePtr val;
char *tmp = NULL;
virMutexLock(&ipAddressMapLock);
@ -68,18 +65,14 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr)
virNWFilterVarValueFree(val);
goto cleanup;
} else {
if (VIR_STRDUP(tmp, addr) < 0)
if (virNWFilterVarValueAddValue(val, addr) < 0)
goto cleanup;
if (virNWFilterVarValueAddValue(val, tmp) < 0)
goto cleanup;
tmp = NULL;
}
ret = 0;
cleanup:
virMutexUnlock(&ipAddressMapLock);
VIR_FREE(tmp);
return ret;
}