642b015b684a57d9e42b0a867ed4dc1e516c7897 galt Sat Dec 21 23:26:22 2024 -0800 fixing more warnings on R9. diff --git src/lib/common.c src/lib/common.c index b2c18c6..08b4e27 100644 --- src/lib/common.c +++ src/lib/common.c @@ -3470,32 +3470,31 @@ freeMem(needleCopy); if(p==NULL) return NULL; return p-q+haystack; } int vatruncatef(char *buf, int size, char *format, va_list args) /* Like vasafef, but truncates the formatted string instead of barfing on * overflow. */ { char *truncStr = " [truncated]"; int sz = vsnprintf(buf, size, format, args); /* note that some version return -1 if too small */ if ((sz < 0) || (sz >= size)) - strncpy(buf + size - 1 - strlen(truncStr), truncStr, strlen(truncStr)); -buf[size-1] = 0; + strncpy(buf + size - 1 - strlen(truncStr), truncStr, strlen(truncStr)+1); return sz; } void truncatef(char *buf, int size, char *format, ...) /* Like safef, but truncates the formatted string instead of barfing on * overflow. */ { va_list args; va_start(args, format); vatruncatef(buf, size, format, args); // ignore returned size va_end(args); } int vasafef(char* buffer, int bufSize, char *format, va_list args) /* Format string to buffer, vsprintf style, only with buffer overflow