scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 08:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some further snprintf warns

Browse Source 
fixes warnings with Xcode 14.3 as in previous commit

+ allocate +1 in Log_output buffer - snprintf(MULL, 0...) returns number
  of bytes without terminating '\0'. std::string storage isn't guaranteed
  to be NULL-terminated (std::string("").at(0) throws an exception). The
  buffer is somewhere preallocated 256 which prevents problem but it's
  better not to rely upon it.
+ comment out some unused function in LDGM that also triggered the
  warning but looked a bit suspicious so it was not clear how to fix
This commit is contained in:
Martin Pulec
2023-04-12 09:01:54 +02:00
parent e1dc81b55a
commit 602095e38a
9 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/debug.cpp
View File

@@ -104,17 +104,18 @@ int log_vprintf(int level, const char *format, va_list ap)
const auto& style = get_log_output().get_level_style(level);
buf.append(style);
buf.append(size, '\0');
buf.append(size + 1, '\0');
va_copy(aq, ap);
if (vsprintf(buf.data() + style.length(), format, ap) != size) {
if (vsnprintf(buf.data() + style.length(), size + 1, format, ap) != size) {
va_end(aq);
return 0;
}
va_end(aq);
auto & str = buf.get();
str.resize(str.size() - 1); // drop '\0' written by vsnprintf
if (get_log_output().is_interactive()) {
auto & str = buf.get();
if (str.at(str.size() - 1) == '\n') { // put TERM_RESET before '\n'
str.erase(str.size() - 1);
buf.append(TERM_RESET "\n");
@@ -177,12 +178,12 @@ void debug_dump(const void *lp, int len)
while (start < len) {
/* start line with pointer position key */
p = (const char *)lp + start;
sprintf(Buff, "%p: ", p);
snprintf(Buff, sizeof Buff, "%p: ", p);
/* display each character as hex value */
for (i = start, j = 0; j < 16; p++, i++, j++) {
if (i < len) {
sprintf(tmpBuf, "%02X ", ((int)(*p) & 0xFF));
snprintf(tmpBuf, sizeof tmpBuf, "%02X ", ((int)(*p) & 0xFF));
strcat(Buff, tmpBuf);
} else
strcat(Buff, " ");
@@ -196,9 +197,9 @@ void debug_dump(const void *lp, int len)
for (i = start, j = 0, p = (const char *)lp + start;
(i < len && j < 16); p++, i++, j++) {
if (((*p) >= ' ') && ((*p) <= '~')) /* test displayable */
sprintf(tmpBuf, "%c", *p);
snprintf(tmpBuf, sizeof tmpBuf, "%c", *p);
else
sprintf(tmpBuf, "%c", '.');
snprintf(tmpBuf, sizeof tmpBuf, "%c", '.');
strcat(Buff, tmpBuf);
if (j == 7) /* space between groups of 8 */
strcat(Buff, " ");