On Wed, Feb 06, 2008 at 11:45:59PM +0000, Mark McLoughlin wrote: > xenHypervisorMakeCapabilitiesXML() can be called with either > of it's FILE* paramaters NULL; don't crash when the capabilities > pointer is NULL. > > Signed-off-by: Mark McLoughlin <markmc@xxxxxxxxxx> > Index: libvirt/src/xen_internal.c > =================================================================== > --- libvirt.orig/src/xen_internal.c 2008-02-06 22:38:06.000000000 +0000 > +++ libvirt/src/xen_internal.c 2008-02-06 23:38:54.000000000 +0000 > @@ -2233,7 +2233,7 @@ > */ > > /* Expecting one line in this file - ignore any more. */ > - if (fgets (line, sizeof line, capabilities)) { > + if (capabilities && fgets (line, sizeof line, capabilities)) { > /* Split the line into tokens. strtok_r is OK here because we "own" > * this buffer. Parse out the features from each token. > */ okay, but I still prefer when test expressions are fully parenthetized, so preferabbly with ()() added, thanks :-) +1 Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard@xxxxxxxxxx | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ -- Libvir-list mailing list Libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list