47 lines
1.0 KiB
Diff
47 lines
1.0 KiB
Diff
|
BASH PATCH REPORT
|
||
|
|
=================
|
||
|
|
|
||
|
|
Bash-Release: 4.2
|
||
|
|
Patch-ID: bash42-022
|
||
|
|
|
||
|
|
Bug-Reported-by: Gregory Margo <gmargo@pacbell.net>
|
||
|
|
Bug-Reference-ID: <20110727174529.GA3333@pacbell.net>
|
||
|
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html
|
||
|
|
|
||
|
|
Bug-Description:
|
||
|
|
|
||
|
|
The return value from lseek is `off_t'. This can cause corrupted return
|
||
|
|
values when the file offset is greater than 2**31 - 1.
|
||
|
|
|
||
|
|
Patch (apply with `patch -p0'):
|
||
|
|
|
||
|
|
--- a/lib/sh/zread.c
|
||
|
|
+++ b/lib/sh/zread.c
|
||
|
|
@@ -160,14 +160,13 @@ void
|
||
|
|
zsyncfd (fd)
|
||
|
|
int fd;
|
||
|
|
{
|
||
|
|
- off_t off;
|
||
|
|
- int r;
|
||
|
|
+ off_t off, r;
|
||
|
|
|
||
|
|
off = lused - lind;
|
||
|
|
r = 0;
|
||
|
|
if (off > 0)
|
||
|
|
r = lseek (fd, -off, SEEK_CUR);
|
||
|
|
|
||
|
|
- if (r >= 0)
|
||
|
|
+ if (r != -1)
|
||
|
|
lused = lind = 0;
|
||
|
|
}
|
||
|
|
--- a/patchlevel.h
|
||
|
|
+++ b/patchlevel.h
|
||
|
|
@@ -25,6 +25,6 @@
|
||
|
|
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
||
|
|
looks for to find the patch level (for the sccs version string). */
|
||
|
|
|
||
|
|
-#define PATCHLEVEL 21
|
||
|
|
+#define PATCHLEVEL 22
|
||
|
|
|
||
|
|
#endif /* _PATCHLEVEL_H_ */
|