diff options
-rw-r--r-- | common/console_common.c | 15 | ||||
-rw-r--r-- | pbl/console.c | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/common/console_common.c b/common/console_common.c index 4c1230464c..98ff8d0ef9 100644 --- a/common/console_common.c +++ b/common/console_common.c @@ -126,7 +126,7 @@ int pr_print(int level, const char *fmt, ...) return 0; va_start(args, fmt); - i = vsprintf(printbuffer, fmt, args); + i = vsnprintf(printbuffer, sizeof(printbuffer), fmt, args); va_end(args); pr_puts(level, printbuffer); @@ -139,18 +139,19 @@ int dev_printf(int level, const struct device_d *dev, const char *format, ...) va_list args; int ret = 0; char printbuffer[CFG_PBSIZE]; + size_t size = sizeof(printbuffer); if (!IS_ENABLED(CONFIG_LOGBUF) && level > barebox_loglevel) return 0; if (dev->driver && dev->driver->name) - ret += sprintf(printbuffer, "%s ", dev->driver->name); + ret += snprintf(printbuffer, size, "%s ", dev->driver->name); - ret += sprintf(printbuffer + ret, "%s: ", dev_name(dev)); + ret += snprintf(printbuffer + ret, size - ret, "%s: ", dev_name(dev)); va_start(args, format); - ret += vsprintf(printbuffer + ret, format, args); + ret += vsnprintf(printbuffer + ret, size - ret, format, args); va_end(args); @@ -235,7 +236,7 @@ int printf(const char *fmt, ...) * For this to work, printbuffer must be larger than * anything we ever want to print. */ - i = vsprintf (printbuffer, fmt, args); + i = vsnprintf(printbuffer, sizeof(printbuffer), fmt, args); va_end(args); /* Print the string */ @@ -254,7 +255,7 @@ int vprintf(const char *fmt, va_list args) * For this to work, printbuffer must be larger than * anything we ever want to print. */ - i = vsprintf(printbuffer, fmt, args); + i = vsnprintf(printbuffer, sizeof(printbuffer), fmt, args); /* Print the string */ puts(printbuffer); @@ -342,7 +343,7 @@ int dprintf(int file, const char *fmt, ...) * For this to work, printbuffer must be larger than * anything we ever want to print. */ - vsprintf(printbuffer, fmt, args); + vsnprintf(printbuffer, sizeof(printbuffer), fmt, args); va_end(args); /* Print the string */ diff --git a/pbl/console.c b/pbl/console.c index 007e4e4b83..1efcaa0047 100644 --- a/pbl/console.c +++ b/pbl/console.c @@ -54,7 +54,7 @@ int printf(const char *fmt, ...) char printbuffer[CFG_PBSIZE]; va_start(args, fmt); - i = vsprintf(printbuffer, fmt, args); + i = vsnprintf(printbuffer, sizeof(printbuffer), fmt, args); va_end(args); console_puts(CONSOLE_STDOUT, printbuffer); @@ -69,7 +69,7 @@ int pr_print(int level, const char *fmt, ...) char printbuffer[CFG_PBSIZE]; va_start(args, fmt); - i = vsprintf(printbuffer, fmt, args); + i = vsnprintf(printbuffer, sizeof(printbuffer), fmt, args); va_end(args); console_puts(CONSOLE_STDOUT, printbuffer); |