os: don't malloc memory in LogVMessageVerb.
LogVWrite is limited to a buffer size of 1024, so we don't loose anything here by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends) during signal handlers with the normal message types. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Alan Coopersmith <alan.coopersmith@sun.com>
This commit is contained in:
parent
62d2fb6863
commit
0e0642ee94
22
os/log.c
22
os/log.c
|
@ -316,7 +316,7 @@ void
|
|||
LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
|
||||
{
|
||||
const char *s = X_UNKNOWN_STRING;
|
||||
char *tmpBuf = NULL;
|
||||
char tmpBuf[1024];
|
||||
|
||||
/* Ignore verbosity for X_ERROR */
|
||||
if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
|
||||
|
@ -358,21 +358,11 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
|
|||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Prefix the format string with the message type. We do it this way
|
||||
* so that LogVWrite() is only called once per message.
|
||||
*/
|
||||
if (s) {
|
||||
tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1);
|
||||
/* Silently return if malloc fails here. */
|
||||
if (!tmpBuf)
|
||||
return;
|
||||
sprintf(tmpBuf, "%s ", s);
|
||||
strcat(tmpBuf, format);
|
||||
LogVWrite(verb, tmpBuf, args);
|
||||
free(tmpBuf);
|
||||
} else
|
||||
LogVWrite(verb, format, args);
|
||||
/* if s is not NULL we need a space before format */
|
||||
snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
|
||||
s ? " " : "",
|
||||
format);
|
||||
LogVWrite(verb, tmpBuf, args);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue