diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:14:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:14:52 +0000 |
| commit | 13d8e026645b4fdd4f148554202ff957f1f3bdbf (patch) | |
| tree | 31a5f8447a43f158dbc11d2de619b9b1a4ed781f | |
| parent | 1b3236e1c86afa9e0f35d15445c614e78c154f82 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | src/FSlibInt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/FSlibInt.c b/src/FSlibInt.c index 70167bd..fc17e4f 100644 --- a/src/FSlibInt.c +++ b/src/FSlibInt.c @@ -498,9 +498,10 @@ _FSReadPad(svr, data, size) if (bytes_read > 0) { size -= bytes_read; if (iov[0].iov_len < bytes_read) { - iov[1].iov_len += iov[0].iov_len - bytes_read; + int pad_bytes_read = bytes_read - iov[0].iov_len; + iov[1].iov_len -= pad_bytes_read; iov[1].iov_base = - (char *)iov[1].iov_base +bytes_read - iov[0].iov_len; + (char *)iov[1].iov_base + pad_bytes_read; iov[0].iov_len = 0; } else { iov[0].iov_len -= bytes_read; |