NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-14 17:33:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix errors in virReportSystemErrorFull

Browse Source 
* src/virterror.c (virStrerror): New function.
(virReportSystemErrorFull): Don't leak "combined".
In fact, don't even attempt allocation.
Do include the result of formatted print in final diagnostic.
This commit is contained in:
Jim Meyering 2009-01-27 10:57:18 +00:00
parent 4e8f63fdaa
commit e15147c141
2 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Tue Jan 27 11:53:32 +0100 2009 Jim Meyering <meyering@redhat.com>
and Daniel P. Berrange <berrange@redhat.com>
fix errors in virReportSystemErrorFull
* src/virterror.c (virStrerror): New function.
(virReportSystemErrorFull): Don't leak "combined".
In fact, don't even attempt allocation.
Do include the result of formatted print in final diagnostic.
Tue Jan 27 10:38:09 +0100 2009 Jim Meyering <meyering@redhat.com> Tue Jan 27 10:38:09 +0100 2009 Jim Meyering <meyering@redhat.com>
use gnulib's stpcpy module use gnulib's stpcpy module

72
src/virterror.c
View File

@ -1005,6 +1005,27 @@ void virReportErrorHelper(virConnectPtr conn, int domcode, int errcode,
} }
static const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen)
{
#ifdef HAVE_STRERROR_R
# ifdef __USE_GNU
/* Annoying linux specific API contract */
return strerror_r(theerrno, errBuf, errBufLen);
# else
strerror_r(theerrno, errBuf, errBufLen);
return errBuf;
# endif
#else
/* Mingw lacks strerror_r() and its strerror() is definitely not
* threadsafe, so safest option is to just print the raw errno
* value - we can at least reliably & safely look it up in the
* header files for debug purposes
*/
int n = snprintf(errBuf, errBufLen, "errno=%d", theerrno);
return (0 < n && n < errBufLen
? errBuf : _("internal error: buffer too small"));
#endif
}
void virReportSystemErrorFull(virConnectPtr conn, void virReportSystemErrorFull(virConnectPtr conn,
int domcode, int domcode,
@ -1014,48 +1035,37 @@ void virReportSystemErrorFull(virConnectPtr conn,
size_t linenr ATTRIBUTE_UNUSED, size_t linenr ATTRIBUTE_UNUSED,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list args; char strerror_buf[1024];
char errorMessage[1024]; char msgDetailBuf[1024];
char systemError[1024];
char *theerrnostr;
const char *virerr;
char *combined = NULL;
#ifdef HAVE_STRERROR_R const char *errnoDetail = virStrerror(theerrno, strerror_buf,
#ifdef __USE_GNU sizeof(strerror_buf));
/* Annoying linux specific API contract */ const char *msg = virErrorMsg(VIR_ERR_SYSTEM_ERROR, fmt);
theerrnostr = strerror_r(theerrno, systemError, sizeof(systemError)); const char *msgDetail = NULL;
#else
strerror_r(theerrno, systemError, sizeof(systemError));
theerrnostr = systemError;
#endif
#else
/* Mingw lacks strerror_r() and its strerror() is definitely not
* threadsafe, so safest option is to just print the raw errno
* value - we can at least reliably & safely look it up in the
* header files for debug purposes
*/
snprintf(systemError, sizeof(systemError), "errno=%d", theerrno);
theerrnostr = systemError;
#endif
if (fmt) { if (fmt) {
va_list args;
int n;
va_start(args, fmt); va_start(args, fmt);
vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args); n = vsnprintf(msgDetailBuf, sizeof(msgDetailBuf), fmt, args);
va_end(args); va_end(args);
} else {
errorMessage[0] = '\0'; size_t len = strlen (msgDetailBuf);
if (0 <= n && n + 2 + len < sizeof (msgDetailBuf)) {
char *p = msgDetailBuf + n;
stpcpy (stpcpy (p, ": "), errnoDetail);
msgDetail = msgDetailBuf;
}
} }
if (virAsprintf(&combined, "%s: %s", errorMessage, theerrnostr) < 0) if (!msgDetailBuf)
combined = theerrnostr; /* OOM, so lets just pass the strerror info as best effort */ msgDetail = errnoDetail;
virerr = virErrorMsg(VIR_ERR_SYSTEM_ERROR, (errorMessage[0] ? errorMessage : NULL));
virRaiseError(conn, NULL, NULL, domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR, virRaiseError(conn, NULL, NULL, domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR,
virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); msg, msgDetail, NULL, -1, -1, msg, msgDetail);
} }
void virReportOOMErrorFull(virConnectPtr conn, void virReportOOMErrorFull(virConnectPtr conn,
int domcode, int domcode,
const char *filename ATTRIBUTE_UNUSED, const char *filename ATTRIBUTE_UNUSED,