From fe1183a7cd536e625cbdce0babf1c54ed1d558ac Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 2 Feb 2010 20:54:01 +0100 Subject: [PATCH] interface_conf.c: don't use a negative value as allocation size * src/conf/interface_conf.c (virInterfaceDefParseProtoIPv4): If virXPathNodeSet returns -1, indicate failure by returning -1 right away. (virInterfaceDefParseProtoIPv6): Likewise. --- src/conf/interface_conf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 8a17ed6261..510df81307 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -1,7 +1,7 @@ /* * interface_conf.c: interfaces XML handling * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -320,6 +320,8 @@ virInterfaceDefParseProtoIPv4(virConnectPtr conn, virInterfaceProtocolDefPtr def } nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); + if (nIpNodes < 0) + return -1; if (ipNodes == NULL) return 0; @@ -377,6 +379,8 @@ virInterfaceDefParseProtoIPv6(virConnectPtr conn, virInterfaceProtocolDefPtr def } nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); + if (nIpNodes < 0) + return -1; if (ipNodes == NULL) return 0;