diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-05-20 21:54:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-05-20 21:54:57 +0200 |
| commit | 09e1b0e3f6facc1af2dbcfef204f0aaa8718772b (patch) | |
| tree | 18056a8f7177511eff47519d176c310901f5e455 /libio/iofsetpos.c | |
| parent | 75c51570c710aa9c6df6b7a1e131392e1408c63f (diff) | |
| download | glibc-09e1b0e3f6facc1af2dbcfef204f0aaa8718772b.tar.gz glibc-09e1b0e3f6facc1af2dbcfef204f0aaa8718772b.tar.xz glibc-09e1b0e3f6facc1af2dbcfef204f0aaa8718772b.zip | |
libio: Remove codecvt vtable [BZ #24588]
The codecvt vtable is not a real vtable because it also contains the conversion state data. Furthermore, wide stream support was added to GCC 3.0, after a C++ ABI bump, so there is no compatibility requirement with libstdc++. This change removes several unmangled function pointers which could be used with a corrupted FILE object to redirect execution. (libio vtable verification did not cover the codecvt vtable.) Reviewed-by: Yann Droneaud <ydroneaud@opteya.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'libio/iofsetpos.c')
| -rw-r--r-- | libio/iofsetpos.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libio/iofsetpos.c b/libio/iofsetpos.c index d7b1abbc61..4df1aae082 100644 --- a/libio/iofsetpos.c +++ b/libio/iofsetpos.c @@ -58,8 +58,7 @@ _IO_new_fsetpos (FILE *fp, const __fpos_t *posp) else { result = 0; - if (fp->_mode > 0 - && (*fp->_codecvt->__codecvt_do_encoding) (fp->_codecvt) < 0) + if (fp->_mode > 0 && __libio_codecvt_encoding (fp->_codecvt) < 0) /* This is a stateful encoding, restore the state. */ fp->_wide_data->_IO_state = posp->__state; } |