From 70eb53366995e842f0f29733979a13b6738ffb1a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 1 May 2018 11:47:24 -0700 Subject: [PATCH] s3: printing: Now we never pass an offset of -1, remove the off_t==-1 protections from printing_pread_data(). Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/printing/nt_printing.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 328964579d8..6bc48ae3634 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -324,15 +324,13 @@ static ssize_t printing_pread_data(files_struct *fsp, size_t total=0; off_t in_pos = *poff; - if (in_pos != (off_t)-1) { - in_pos = SMB_VFS_LSEEK(fsp, in_pos, SEEK_SET); - if (in_pos == (off_t)-1) { - return -1; - } - /* Don't allow integer wrap on read. */ - if (in_pos + byte_count < in_pos) { - return -1; - } + in_pos = SMB_VFS_LSEEK(fsp, in_pos, SEEK_SET); + if (in_pos == (off_t)-1) { + return -1; + } + /* Don't allow integer wrap on read. */ + if (in_pos + byte_count < in_pos) { + return -1; } while (total < byte_count) { @@ -340,9 +338,7 @@ static ssize_t printing_pread_data(files_struct *fsp, byte_count - total); if (ret == 0) { - if (*poff != (off_t)-1) { - *poff = in_pos; - } + *poff = in_pos; return total; } if (ret == -1) { @@ -355,9 +351,7 @@ static ssize_t printing_pread_data(files_struct *fsp, in_pos += ret; total += ret; } - if (*poff != (off_t)-1) { - *poff = in_pos; - } + *poff = in_pos; return (ssize_t)total; } -- 2.34.1