External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virConfGetValue: Fixed NULL pointer check

Browse Source 
This patch fixes a NULL pointer check that was causing SegFault on
some specific configurations. It also reverts commit 59d0c9801c1ab
that was checking for this value in one place.
This commit is contained in:
Martin Kletzander 2012-03-19 11:05:30 +01:00 committed by Michal Privoznik
parent 787f4feb4d
commit 3992cfdd79
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libvirt.c
View File

@ -1085,8 +1085,7 @@ virConnectOpenResolveURIAlias(virConfPtr conf,
*uri = NULL; *uri = NULL;
if (conf && if ((value = virConfGetValue(conf, "uri_aliases")))
(value = virConfGetValue(conf, "uri_aliases")))
ret = virConnectOpenFindURIAliasMatch(value, alias, uri); ret = virConnectOpenFindURIAliasMatch(value, alias, uri);
else else
ret = 0; ret = 0;

5
src/util/conf.c
View File

@ -1,7 +1,7 @@
/** /**
* conf.c: parser for a subset of the Python encoded Xen configuration files * conf.c: parser for a subset of the Python encoded Xen configuration files
* *
* Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006-2012 Red Hat, Inc.
* *
* See COPYING.LIB for the License of this software * See COPYING.LIB for the License of this software
* *
@ -836,6 +836,9 @@ virConfGetValue(virConfPtr conf, const char *setting)
{ {
virConfEntryPtr cur; virConfEntryPtr cur;
if (conf == NULL)
return NULL;
cur = conf->entries; cur = conf->entries;
while (cur != NULL) { while (cur != NULL) {
if ((cur->name != NULL) && if ((cur->name != NULL) &&