OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-11-04 Jakub Jelinek <jakub@redhat.com>

Browse Source 
* libio/ftello.c (ftello): Don't subtract save_end - save_base
	if pos is _IO_pos_BAD.
	* libio/ftello64.c (ftello64): Likewise.
	* libio/iofgetpos.c (_IO_new_fgetpos): Likewise.
	* libio/iofgetpos64.c (_IO_new_fgetpos64): Likewise.
	* libio/oldiofgetpos.c (_IO_old_fgetpos): Likewise.
	* libio/oldiofgetpos64.c (_IO_old_fgetpos64): Likewise.
	* libio/ioftell.c (_IO_ftell): Likewise.
	Cast to long int instead of off_t when checking for overflow.
This commit is contained in:
Roland McGrath 2004-11-04 23:22:02 +00:00
parent a129c4fe72
commit 3447be7bb3
7 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libio/ftello.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -39,7 +40,7 @@ ftello (fp)
CHECK_FILE (fp, -1L); CHECK_FILE (fp, -1L);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
{ {
if (fp->_mode <= 0) if (fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;

5
libio/ftello64.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -40,7 +41,7 @@ ftello64 (fp)
CHECK_FILE (fp, -1L); CHECK_FILE (fp, -1L);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
{ {
if (fp->_mode <= 0) if (fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;

5
libio/iofgetpos.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -40,7 +41,7 @@ _IO_new_fgetpos (fp, posp)
CHECK_FILE (fp, EOF); CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
{ {
if (fp->_mode <= 0) if (fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;

5
libio/iofgetpos64.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -41,7 +42,7 @@ _IO_new_fgetpos64 (fp, posp)
CHECK_FILE (fp, EOF); CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
{ {
if (fp->_mode <= 0) if (fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;

7
libio/ioftell.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1993,1995-2000,2001,2002,2003 Free Software Foundation, Inc. /* Copyright (C) 1993, 1995-2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -38,7 +39,7 @@ _IO_ftell (fp)
CHECK_FILE (fp, -1L); CHECK_FILE (fp, -1L);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
{ {
if (_IO_vtable_offset (fp) != 0 || fp->_mode <= 0) if (_IO_vtable_offset (fp) != 0 || fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;
@ -52,7 +53,7 @@ _IO_ftell (fp)
#endif #endif
return -1L; return -1L;
} }
if ((_IO_off64_t) (off_t) pos != pos) if ((_IO_off64_t) (long int) pos != pos)
{ {
#ifdef EOVERFLOW #ifdef EOVERFLOW
__set_errno (EOVERFLOW); __set_errno (EOVERFLOW);

2
libio/oldiofgetpos.c
View File

@ -42,7 +42,7 @@ _IO_old_fgetpos (fp, posp)
CHECK_FILE (fp, EOF); CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;
_IO_release_lock (fp); _IO_release_lock (fp);
if (pos == _IO_pos_BAD) if (pos == _IO_pos_BAD)

2
libio/oldiofgetpos64.c
View File

@ -43,7 +43,7 @@ _IO_old_fgetpos64 (fp, posp)
CHECK_FILE (fp, EOF); CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
if (_IO_in_backup (fp)) if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;
_IO_release_lock (fp); _IO_release_lock (fp);
if (pos == _IO_pos_BAD) if (pos == _IO_pos_BAD)