1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

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

* 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

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.
The GNU C Library is free software; you can redistribute it and/or
@ -39,7 +40,7 @@ ftello (fp)
CHECK_FILE (fp, -1L);
_IO_acquire_lock (fp);
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)
pos -= fp->_IO_save_end - fp->_IO_save_base;