diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 18:07:31 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 18:07:31 +0100 |
| commit | 3d80d6ba301e4d26b646c84d621ebe880ebc513f (patch) | |
| tree | 66564978a733aeb412e825d64783a21acd3ef4fc /runtime/stream.c | |
| parent | 7916735ba6890f67d49077975b0d635dc9931380 (diff) | |
| download | rsyslog-3d80d6ba301e4d26b646c84d621ebe880ebc513f.tar.gz rsyslog-3d80d6ba301e4d26b646c84d621ebe880ebc513f.tar.xz rsyslog-3d80d6ba301e4d26b646c84d621ebe880ebc513f.zip | |
bugfix: potential problem (loop, abort) when file write error occured
When a write error occured in stream.c, variable iWritten had the error
code but this was handled as if it were the actual number of bytes
written. That was used in pointer arithmetic later on, and thus could
lead to all sorts of problems. However, this could only happen if the
error was EINTR or the file in question was a tty. All other cases were
handled properly. Now, iWritten is reset to zero in such cases, resulting
in proper retries.
Diffstat (limited to 'runtime/stream.c')
| -rw-r--r-- | runtime/stream.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 36f44003..82718099 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -790,6 +790,7 @@ doWriteCall(strm_t *pThis, uchar *pBuf, size_t *pLenBuf) if(iWritten < 0) { char errStr[1024]; int err = errno; + iWritten = 0; /* we have written NO bytes! */ rs_strerror_r(err, errStr, sizeof(errStr)); DBGPRINTF("log file (%d) write error %d: %s\n", pThis->fd, err, errStr); if(err == EINTR) { |