ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #463 from toyowata/master 

[Common] Fixed crash issue in RawSerial::printf for uARM
pull/431/merge
Martin Kojtal 2014-08-27 10:57:32 +08:00
parent 74958e0f72 d05b7f51d8
commit d20ce63487
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/mbed/common/RawSerial.cpp
View File

@ -47,6 +47,13 @@ int RawSerial::puts(const char *str) {
int RawSerial::printf(const char *format, ...) {
std::va_list arg;
va_start(arg, format);
#if defined(__MICROLIB) && defined(__ARMCC_VERSION) // with microlib and ARM compiler
char *temp;
temp = (char*)alloca(STRING_STACK_LIMIT);
vsprintf(temp, format, arg);
puts(temp);
int len = strlen(temp);
#else
int len = vsnprintf(NULL, 0, format, arg);
if (len < STRING_STACK_LIMIT) {
char temp[STRING_STACK_LIMIT];
@ -58,6 +65,7 @@ int RawSerial::printf(const char *format, ...) {
puts(temp);
delete[] temp;
}
#endif
va_end(arg);
return len;
}