diff options
| -rw-r--r-- | lib/libc_r/uthread/uthread_writev.c | 14 | ||||
| -rw-r--r-- | lib/libkse/thread/thr_writev.c | 14 | ||||
| -rw-r--r-- | lib/libpthread/thread/thr_writev.c | 14 |
3 files changed, 39 insertions, 3 deletions
diff --git a/lib/libc_r/uthread/uthread_writev.c b/lib/libc_r/uthread/uthread_writev.c index 8ca5db7d8264..375f59912b6f 100644 --- a/lib/libc_r/uthread/uthread_writev.c +++ b/lib/libc_r/uthread/uthread_writev.c @@ -136,8 +136,20 @@ writev(int fd, const struct iovec * iov, int iovcnt) cnt = 0; } } - } + } else if (n == 0) { + /* + * Avoid an infinite loop if the last iov_len is + * 0. + */ + while (idx < iovcnt && p_iov[idx].iov_len == 0) + idx++; + if (idx == iovcnt) { + ret = num; + break; + } + } + /* * If performing a blocking write, check if the * write would have blocked or if some bytes diff --git a/lib/libkse/thread/thr_writev.c b/lib/libkse/thread/thr_writev.c index 8ca5db7d8264..375f59912b6f 100644 --- a/lib/libkse/thread/thr_writev.c +++ b/lib/libkse/thread/thr_writev.c @@ -136,8 +136,20 @@ writev(int fd, const struct iovec * iov, int iovcnt) cnt = 0; } } - } + } else if (n == 0) { + /* + * Avoid an infinite loop if the last iov_len is + * 0. + */ + while (idx < iovcnt && p_iov[idx].iov_len == 0) + idx++; + if (idx == iovcnt) { + ret = num; + break; + } + } + /* * If performing a blocking write, check if the * write would have blocked or if some bytes diff --git a/lib/libpthread/thread/thr_writev.c b/lib/libpthread/thread/thr_writev.c index 8ca5db7d8264..375f59912b6f 100644 --- a/lib/libpthread/thread/thr_writev.c +++ b/lib/libpthread/thread/thr_writev.c @@ -136,8 +136,20 @@ writev(int fd, const struct iovec * iov, int iovcnt) cnt = 0; } } - } + } else if (n == 0) { + /* + * Avoid an infinite loop if the last iov_len is + * 0. + */ + while (idx < iovcnt && p_iov[idx].iov_len == 0) + idx++; + if (idx == iovcnt) { + ret = num; + break; + } + } + /* * If performing a blocking write, check if the * write would have blocked or if some bytes |