External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

logging: always NUL-terminate circular buffer

Browse Source 
* src/util/logging.c (virLogStartup, virLogSetBufferSize):
Over-allocate, so that a debugger can just print the circular
buffer.  Suggested by Daniel Veillard.
This commit is contained in:
Eric Blake 2011-03-23 13:23:59 -06:00
parent 009bd51b94
commit 60dea30b7d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/logging.c
View File

@ -197,14 +197,14 @@ int virLogStartup(void) {
virLogInitialized = 1; virLogInitialized = 1;
virLogLock(); virLogLock();
if (VIR_ALLOC_N(virLogBuffer, virLogSize) < 0) { if (VIR_ALLOC_N(virLogBuffer, virLogSize + 1) < 0) {
/* /*
* The debug buffer is not a critical component, allow startup * The debug buffer is not a critical component, allow startup
* even in case of failure to allocate it in case of a * even in case of failure to allocate it in case of a
* configuration mistake. * configuration mistake.
*/ */
virLogSize = 64 * 1024; virLogSize = 64 * 1024;
if (VIR_ALLOC_N(virLogBuffer, virLogSize) < 0) { if (VIR_ALLOC_N(virLogBuffer, virLogSize + 1) < 0) {
pbm = "Failed to allocate debug buffer: deactivating debug log\n"; pbm = "Failed to allocate debug buffer: deactivating debug log\n";
virLogSize = 0; virLogSize = 0;
} else { } else {
@ -249,14 +249,14 @@ virLogSetBufferSize(int size) {
oldsize = virLogSize; oldsize = virLogSize;
oldLogBuffer = virLogBuffer; oldLogBuffer = virLogBuffer;
if (INT_MAX / 1024 < size) { if (INT_MAX / 1024 <= size) {
pbm = "Requested log size of %d kB too large\n"; pbm = "Requested log size of %d kB too large\n";
ret = -1; ret = -1;
goto error; goto error;
} }
virLogSize = size * 1024; virLogSize = size * 1024;
if (VIR_ALLOC_N(virLogBuffer, virLogSize) < 0) { if (VIR_ALLOC_N(virLogBuffer, virLogSize + 1) < 0) {
pbm = "Failed to allocate debug buffer of %d kB\n"; pbm = "Failed to allocate debug buffer of %d kB\n";
virLogBuffer = oldLogBuffer; virLogBuffer = oldLogBuffer;
virLogSize = oldsize; virLogSize = oldsize;