lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-21 14:00:51 +03:00
Code Activity

Fix trace context lookup in libssh2_debug()

Browse Source 
The trace context is actually a bitmask so that tracing output can be
controlled by setting a bitmask using libssh2_trace().  However, the logic
in libssh2_debug() that converted the context to a string was using the
context value as an array index.  Because the code used a bounds check on
the array, there was never a danger of a crash, but you would certainly
either get the wrong string, or "unknown".

This patch adds a lookup that iterates over the context strings and uses
it's index to check for the corresponding bit in the context.
This commit is contained in:
Dave McCaldon
2010-01-21 09:06:34 -05:00
committed by Peter Stuge
parent 2cb8866f0a
commit 6b23f640f8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/misc.c
View File

@@ -340,14 +340,22 @@ _libssh2_debug(LIBSSH2_SESSION * session, int context, const char *format, ...)
"Publickey", "Publickey",
"Socket", "Socket",
}; };
const char* contexttext = contexts[0];
unsigned int contextindex;
if (context < 1 || context >= (int)ARRAY_SIZE(contexts)) {
context = 0;
}
if (!(session->showmask & context)) { if (!(session->showmask & context)) {
/* no such output asked for */ /* no such output asked for */
return; return;
} }
/* Find the first matching context string for this message */
for (contextindex = 0; contextindex < ARRAY_SIZE(contexts); contextindex++) {
if ((context & (1 << contextindex)) != 0) {
contexttext = contexts[contextindex];
break;
}
}
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if(!firstsec) { if(!firstsec) {
firstsec = now.tv_sec; firstsec = now.tv_sec;
@@ -355,7 +363,7 @@ _libssh2_debug(LIBSSH2_SESSION * session, int context, const char *format, ...)
now.tv_sec -= firstsec; now.tv_sec -= firstsec;
len = snprintf(buffer, sizeof(buffer), "[libssh2] %d.%06d %s: ", len = snprintf(buffer, sizeof(buffer), "[libssh2] %d.%06d %s: ",
(int)now.tv_sec, (int)now.tv_usec, contexts[context]); (int)now.tv_sec, (int)now.tv_usec, contexttext);
va_start(vargs, format); va_start(vargs, format);
len += vsnprintf(buffer + len, 1535 - len, format, vargs); len += vsnprintf(buffer + len, 1535 - len, format, vargs);