summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Mestery <kmestery@cisco.com>2012-10-03 15:46:55 -0400
committerDoug Goldstein <cardoe@cardoe.com>2012-10-21 10:54:47 -0500
commit7feb3393bac71abaef82862e8a44d24868265c9d (patch)
tree8dfa6eb9919dd770eff8b2abaff83dfac34e71bf
parentqemu: Pin the emulator when only cpuset is specified (diff)
downloadlibvirt-v0.10.2-gentoo.tar.gz
libvirt-v0.10.2-gentoo.tar.bz2
libvirt-v0.10.2-gentoo.zip
Correct checking of virStrcpyStatic() return valuev0.10.2-gentoo-2v0.10.2-gentoo
Correct the check for the return value of virStrcpyStatic() when copying port-profile names. Fixes Open vSwitch ports which utilize port-profiles from network definitions. Signed-off-by: Kyle Mestery <kmestery@cisco.com>
-rw-r--r--src/util/virnetdevvportprofile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index d774fb1ad..ac7aa5fcb 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -374,7 +374,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfilePtr orig,
orig->profileID, mods->profileID);
return -1;
}
- if (virStrcpyStatic(orig->profileID, mods->profileID)) {
+ if (virStrcpyStatic(orig->profileID, mods->profileID) == NULL) {
/* this should never happen - it indicates mods->profileID
* isn't properly null terminated. */
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",