From 4090a0870cb38d51d1e6724d583a48bfaba2dd88 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 3 Mar 2008 18:11:16 +0000 Subject: [PATCH] Don't use first byte of string as a pointer. * src/qemu_conf.c (qemudReportError): Use the pointer, errorMessage, not its first byte, errorMessage[0]. --- ChangeLog | 4 ++++ src/qemu_conf.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d331a4cb82..50e48f6aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Mon Mar 3 19:09:51 CET 2008 Jim Meyering + Don't use first byte of string as a pointer. + * src/qemu_conf.c (qemudReportError): Use the pointer, errorMessage, + not its first byte, errorMessage[0]. + Avoid segfault upon early libvirtd failure. * qemud/qemud.c (main): Don't call qemudCleanup on an uninitialized pointer. diff --git a/src/qemu_conf.c b/src/qemu_conf.c index eead0bca29..e54da5b230 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } - virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); }