cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2024-12-20 19:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bug that affected unterminated buffers: strlcat() would write a NUL

Browse source 
past the end of the buffer and return one less than the correct length.
This commit is contained in:
Dag-Erling Smørgrav 2014-07-13 20:42:56 +00:00 committed by des
parent 08208a1b3e
commit 3ed82792fc
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/core/cryb_strlcat.c
View file

@ -43,11 +43,12 @@ cryb_strlcat(char *dst, const char *src, size_t size)
{ {
size_t len; size_t len;
for (len = 0; *dst && size > 1; ++len, --size) for (len = 0; *dst && len < size; ++len, ++dst)
dst++; /* nothing */;
for (; *src && size > 1; ++len, --size) for (; *src && len + 1 < size; ++len, ++src, ++dst)
*dst++ = *src++; *dst = *src;
*dst = '\0'; if (len < size)
*dst = '\0';
while (*src) while (*src)
++len, ++src; ++len, ++src;
return (len); return (len);