vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

librb: rb_snprinf_append: handle error return value from vsnprintf()

Browse source
This commit is contained in:
Simon Arlott 2017-07-30 17:03:30 +01:00
parent 2cc7be9977
commit 8573c3409e
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
librb/src/tools.c
View file

@ -303,22 +303,25 @@ int
rb_snprintf_append(char *str, size_t len, const char *format, ...) rb_snprintf_append(char *str, size_t len, const char *format, ...)
{ {
if(len == 0) if(len == 0)
return 0; return -1;
size_t x = strlen(str); int orig_len = strlen(str);
if(len < x) if((int)len < orig_len)
{ {
str[len - 1] = '\0'; str[len - 1] = '\0';
return (int)len - 1; return len - 1;
} }
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
int y = (vsnprintf(str + x, len - x, format, ap) + (int)x); int append_len = vsnprintf(str + orig_len, len - orig_len, format, ap);
va_end(ap); va_end(ap);
return (y); if (append_len < 0)
return append_len;
return (orig_len + append_len);
} }
/* rb_basename /* rb_basename