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/libio.h | |
| 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/libio.h')
| -rw-r--r-- | libio/libio.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/libio/libio.h b/libio/libio.h index c38095ff77..b985c386a2 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -116,40 +116,8 @@ struct _IO_marker { int _pos; }; -/* This is the structure from the libstdc++ codecvt class. */ -enum __codecvt_result -{ - __codecvt_ok, - __codecvt_partial, - __codecvt_error, - __codecvt_noconv -}; - -/* The order of the elements in the following struct must match the order - of the virtual functions in the libstdc++ codecvt class. */ struct _IO_codecvt { - void (*__codecvt_destr) (struct _IO_codecvt *); - enum __codecvt_result (*__codecvt_do_out) (struct _IO_codecvt *, - __mbstate_t *, - const wchar_t *, - const wchar_t *, - const wchar_t **, char *, - char *, char **); - enum __codecvt_result (*__codecvt_do_unshift) (struct _IO_codecvt *, - __mbstate_t *, char *, - char *, char **); - enum __codecvt_result (*__codecvt_do_in) (struct _IO_codecvt *, - __mbstate_t *, - const char *, const char *, - const char **, wchar_t *, - wchar_t *, wchar_t **); - int (*__codecvt_do_encoding) (struct _IO_codecvt *); - int (*__codecvt_do_always_noconv) (struct _IO_codecvt *); - int (*__codecvt_do_length) (struct _IO_codecvt *, __mbstate_t *, - const char *, const char *, size_t); - int (*__codecvt_do_max_length) (struct _IO_codecvt *); - _IO_iconv_t __cd_in; _IO_iconv_t __cd_out; }; |