From 7523642c01f0598d9c2012720e30591ccb1c4f0b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 23 Jan 2009 13:50:59 +0000 Subject: [PATCH] qemud: don't dereference NULL on failed virGetUserDirectory * qemud/qemud.c (qemudInitPaths): Return right away, upon virGetUserDirectory failure. --- ChangeLog | 8 +++++++- qemud/qemud.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 63931b3337..7a45345e62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 23 14:22:03 +0100 2009 Jim Meyering + + qemud: don't dereference NULL on failed virGetUserDirectory + * qemud/qemud.c (qemudInitPaths): Return right away, + upon virGetUserDirectory failure. + Fri Jan 23 14:30:59 +0100 2009 Jim Meyering m4: update from gnulib to avoid warnings from cutting-edge autoconf @@ -72,7 +78,7 @@ Thu Jan 22 20:17:35 +0100 2009 Jim Meyering Thu Jan 22 10:35:03 PST 2009 John Levon - * gnulib/tests/.cvsignore: add test-random_r + * gnulib/tests/.cvsignore: add test-random_r * Makefile.maint: generate .hgignore * gnulib/tests/.gitignore, .hgignore, m4/.gitignore: regenerate diff --git a/qemud/qemud.c b/qemud/qemud.c index 55f31d5ee1..eb91533c8d 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -719,6 +719,10 @@ static int qemudInitPaths(struct qemud_server *server, goto snprintf_error; } else { char *userdir = virGetUserDirectory(NULL, uid); + if (userdir == NULL) { + /* Do not diagnose here; virGetUserDirectory does that. */ + return -1; + } if (snprintf(sockname, maxlen, "@%s/.libvirt/libvirt-sock", userdir) >= maxlen) { VIR_FREE(userdir);