AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-11-24 15:31:16 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

utils/read_str_safe(): fix wrong behavior and bugs.

Browse Source 
ouch, I did a mess in the original function, fix them:

 * on errors (read() < 0), continue reading after the done bytes, not
   at position 0.

 * read buflen - 1 bytes, so there is always room to store the
   trailing \0, as expected by user due behavior of snprintf(),
   fgets() and others.
This commit is contained in:
Gustavo Sverzut Barbieri 2012-01-03 14:22:05 -02:00
parent 657722dd9d
commit 6717994157
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libkmod/libkmod-util.c
View File

@ -205,17 +205,18 @@ inline void *memdup(const void *p, size_t n)
}
ssize_t read_str_safe(int fd, char *buf, size_t buflen) {
size_t todo = buflen;
size_t done;
size_t todo = buflen - 1;
size_t done = 0;
do {
ssize_t r = read(fd, buf, todo);
ssize_t r = read(fd, buf + done, todo);
if (r == 0)
break;
else if (r > 0)
else if (r > 0) {
todo -= r;
else {
done += r;
} else {
if (errno == EAGAIN || errno == EWOULDBLOCK ||
errno == EINTR)
continue;
@ -224,17 +225,7 @@ ssize_t read_str_safe(int fd, char *buf, size_t buflen) {
}
} while (todo > 0);
done = buflen - todo;
if (done == 0)
buf[0] = '\0';
else {
if (done < buflen)
buf[done] = '\0';
else if (buf[done - 1] != '\0')
return -ENOSPC;
}
buf[done] = '\0';
return done;
}