mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
Avoid passing NULL to printf %s specifier
This commit is contained in:
parent
c7095a4b4c
commit
4d713eabf5
@ -1,3 +1,8 @@
|
||||
Thu Jan 15 17:29:19 GMT 2009 John Levon <levon@movementarian.org>
|
||||
|
||||
* src/internal.h:
|
||||
* src/libvirt.c: Avoid passing NULL to printf %s specifier
|
||||
|
||||
Thu Jan 15 15:11:35 GMT 2009 John Levon <levon@movementarian.org>
|
||||
|
||||
* src/xend_internal.c: Improve xend_get error message
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <verify.h>
|
||||
|
||||
#ifdef HAVE_SYS_SYSLIMITS_H
|
||||
#include <sys/syslimits.h>
|
||||
@ -115,6 +116,13 @@
|
||||
#define ATTRIBUTE_RETURN_CHECK
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
/*
|
||||
* Use this when passing possibly-NULL strings to printf-a-likes.
|
||||
*/
|
||||
#define NULLSTR(s) \
|
||||
((void)verify_true(sizeof *(s) == sizeof (char)), \
|
||||
(s) ? (s) : "(null)")
|
||||
|
||||
/**
|
||||
* TODO:
|
||||
*
|
||||
|
@ -852,10 +852,10 @@ do_open (const char *name,
|
||||
" port %d\n"
|
||||
" path %s\n",
|
||||
name,
|
||||
ret->uri->scheme, ret->uri->opaque,
|
||||
ret->uri->authority, ret->uri->server,
|
||||
ret->uri->user, ret->uri->port,
|
||||
ret->uri->path);
|
||||
NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque),
|
||||
NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server),
|
||||
NULLSTR(ret->uri->user), ret->uri->port,
|
||||
NULLSTR(ret->uri->path));
|
||||
} else {
|
||||
DEBUG0("no name, allowing driver auto-select");
|
||||
}
|
||||
@ -1044,7 +1044,7 @@ virConnectOpenAuth(const char *name,
|
||||
if (virInitialize() < 0)
|
||||
return NULL;
|
||||
|
||||
DEBUG("name=%s, auth=%p, flags=%d", name, auth, flags);
|
||||
DEBUG("name=%s, auth=%p, flags=%d", NULLSTR(name), auth, flags);
|
||||
return do_open (name, auth, flags);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user