NcpUart: Adjust vsnprinf() returned charsWritten in case of overflow (#1064)

This commit is contained in:
Abtin Keshavarzian
2016-12-12 10:13:44 -08:00
committed by Jonathan Hui
parent bc8b1a4cd1
commit 2f7f3f0b99
2 changed files with 7 additions and 2 deletions
+2 -2
View File
@@ -1232,7 +1232,7 @@ const char *otLogRegionToString(otLogRegion aRegion);
otPlatLog( \
aLogLevel, \
aRegion, \
"[%s]%s: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
"[%s]%s: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
otLogLevelToString(aLogLevel), \
otLogRegionToString(aRegion), \
## __VA_ARGS__ \
@@ -1247,7 +1247,7 @@ const char *otLogRegionToString(otLogRegion aRegion);
otPlatLog( \
aLogLevel, \
aRegion, \
"[%s]: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
"[%s]: " aFormat OPENTHREAD_CONFIG_LOG_SUFFIX, \
otLogLevelToString(aLogLevel), \
## __VA_ARGS__ \
)
+5
View File
@@ -279,6 +279,11 @@ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat
va_start(args, aFormat);
if ((charsWritten = vsnprintf(logString, sizeof(logString), aFormat, args)) > 0)
{
if (charsWritten > static_cast<int>(sizeof(logString) - 1))
{
charsWritten = static_cast<int>(sizeof(logString) - 1);
}
otNcpStreamWrite(0, reinterpret_cast<uint8_t*>(logString), charsWritten);
}
va_end(args);