diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2007-03-16 20:05:10 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2007-03-16 20:05:10 +0000 |
| commit | a167bcd8e59baf24d5a200d0c3e31817433974c6 (patch) | |
| tree | 3390f1e4032614b611a661dfcd50d8de273299bd | |
| parent | 826b5591dd604ef68abadff7c8cb7c19e221b9af (diff) | |
| download | newlib-a167bcd8e59baf24d5a200d0c3e31817433974c6.zip newlib-a167bcd8e59baf24d5a200d0c3e31817433974c6.tar.gz newlib-a167bcd8e59baf24d5a200d0c3e31817433974c6.tar.bz2 | |
2007-03-16 Eric Blake <ebb9@byu.net>
* libc/stdio64/fseek064.c (_fseeko64_r): Fix reentrancy.
* libc/stdio64/freopen64.c (_freopen64_r): Ditto.
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/stdio64/freopen64.c | 4 | ||||
| -rw-r--r-- | newlib/libc/stdio64/fseeko64.c | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 62fb9d2..df161dc 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2007-03-16 Eric Blake <ebb9@byu.net> + + * libc/stdio64/fseek064.c (_fseeko64_r): Fix reentrancy. + * libc/stdio64/freopen64.c (_freopen64_r): Ditto. + 2007-03-15 Jeff Johnston <jjohnstn@redhat.com> * configure.in: Add new --enable-newlib-reent-small option. diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index c795cba..4cc7172 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -196,10 +196,10 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), fp->_bf._size = 0; fp->_lbfsize = 0; if (HASUB (fp)) - FREEUB (fp); + FREEUB (ptr, fp); fp->_ub._size = 0; if (HASLB (fp)) - FREELB (fp); + FREELB (ptr, fp); fp->_lb._size = 0; if (f < 0) diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c index fe7e9be..15f285f 100644 --- a/newlib/libc/stdio64/fseeko64.c +++ b/newlib/libc/stdio64/fseeko64.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 1990, 2007 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -197,7 +197,7 @@ _DEFUN (_fseeko64_r, (ptr, fp, offset, whence), */ if (fp->_bf._base == NULL) - __smakebuf (fp); + __smakebuf_r (ptr, fp); if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT)) goto dumb; if ((fp->_flags & __SOPT) == 0) @@ -283,7 +283,7 @@ _DEFUN (_fseeko64_r, (ptr, fp, offset, whence), fp->_p = fp->_bf._base + o; fp->_r = n - o; if (HASUB (fp)) - FREEUB (fp); + FREEUB (ptr, fp); fp->_flags &= ~__SEOF; _funlockfile(fp); return 0; @@ -304,7 +304,7 @@ _DEFUN (_fseeko64_r, (ptr, fp, offset, whence), fp->_r = 0; fp->_p = fp->_bf._base; if (HASUB (fp)) - FREEUB (fp); + FREEUB (ptr, fp); fp->_flags &= ~__SEOF; n = target - curoff; if (n) @@ -330,7 +330,7 @@ dumb: } /* success: clear EOF indicator and discard ungetc() data */ if (HASUB (fp)) - FREEUB (fp); + FREEUB (ptr, fp); fp->_p = fp->_bf._base; fp->_r = 0; /* fp->_w = 0; *//* unnecessary (I think...) */ |