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/libioP.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/libioP.h')
| -rw-r--r-- | libio/libioP.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/libio/libioP.h b/libio/libioP.h index 7bdec86a62..66afaa8968 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -476,7 +476,6 @@ extern const struct _IO_jump_t _IO_streambuf_jumps; extern const struct _IO_jump_t _IO_old_proc_jumps attribute_hidden; extern const struct _IO_jump_t _IO_str_jumps attribute_hidden; extern const struct _IO_jump_t _IO_wstr_jumps attribute_hidden; -extern const struct _IO_codecvt __libio_codecvt attribute_hidden; extern int _IO_do_write (FILE *, const char *, size_t); libc_hidden_proto (_IO_do_write) extern int _IO_new_do_write (FILE *, const char *, size_t); @@ -932,4 +931,32 @@ IO_validate_vtable (const struct _IO_jump_t *vtable) return vtable; } +/* Character set conversion. */ + +enum __codecvt_result +{ + __codecvt_ok, + __codecvt_partial, + __codecvt_error, + __codecvt_noconv +}; + +enum __codecvt_result __libio_codecvt_out (struct _IO_codecvt *, + __mbstate_t *, + const wchar_t *, + const wchar_t *, + const wchar_t **, char *, + char *, char **) + attribute_hidden; +enum __codecvt_result __libio_codecvt_in (struct _IO_codecvt *, + __mbstate_t *, + const char *, const char *, + const char **, wchar_t *, + wchar_t *, wchar_t **) + attribute_hidden; +int __libio_codecvt_encoding (struct _IO_codecvt *) attribute_hidden; +int __libio_codecvt_length (struct _IO_codecvt *, __mbstate_t *, + const char *, const char *, size_t) + attribute_hidden; + #endif /* libioP.h. */ |