0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00

Merge commit '7ee27418' into thread-next

This commit is contained in:
Maria Matejka 2024-12-10 23:50:13 +01:00
commit 1fc569e32b

View File

@ -169,9 +169,9 @@ int bvsnprintf(char *buf, int size, const char *fmt, va_list args)
int qualifier; /* 'h' or 'l' for integer fields */
for (start=str=buf ; *fmt ; ++fmt, size-=(str-start), start=str) {
if (*fmt != '%') {
if (!size)
return -1;
if (*fmt != '%') {
*str++ = *fmt;
continue;
}
@ -272,7 +272,7 @@ int bvsnprintf(char *buf, int size, const char *fmt, va_list args)
len = strlen(s);
if (precision >= 0 && len > precision)
len = precision;
if (len > size)
if ((len > size) || (field_width > size))
return -1;
if (!(flags & LEFT))