database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-28 05:21:27 +03:00
Code

Make the memory layout of Port struct independent of USE_OPENSSL

Browse Source 
Commit d39a49c1e4 added new fields to the struct, but missed the "keep
these last" comment on the previous fields. Add placeholder variables
so that the offsets of the fields are the same whether you build with
USE_OPENSSL or not. This is a courtesy to extensions that might peek
at the fields, to make the ABI the same regardless of the options used
to build PostgreSQL.

In reality, I don't expect any extensions to look at the 'raw_buf'
fields. Firstly, they are new in v17, so no one's written such
extensions yet. Secondly, extensions should have no business poking at
those fields anyway. Nevertheless, fix this properly on 'master'. On
v17, we mustn't change the memory layout, so just fix the comments.

Author: Jacob Champion
Discussion: https://www.postgresql.org/message-id/raw/CAOYmi%2BmKVJNzn5_TD_MK%3DhqO64r_w8Gb0FHCLk0oAkW-PJv8jQ@mail.gmail.com
This commit is contained in:
Heikki Linnakangas 2024-11-22 17:43:04 +02:00
parent 9695835538
commit e3b249c6d8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/include/libpq/libpq-be.h
View File

@ -189,7 +189,8 @@ typedef struct Port
/* /*
* If GSSAPI is supported and used on this connection, store GSSAPI * If GSSAPI is supported and used on this connection, store GSSAPI
* information. Even when GSSAPI is not compiled in, store a NULL pointer * information. Even when GSSAPI is not compiled in, store a NULL pointer
* to keep struct offsets the same (for extension ABI compatibility). * to keep struct offsets of the "SSL structures" below the same (for
* extension ABI compatibility).
*/ */
pg_gssinfo *gss; pg_gssinfo *gss;
#else #else
@ -206,8 +207,7 @@ typedef struct Port
bool alpn_used; bool alpn_used;
/* /*
* OpenSSL structures. (Keep these last so that the locations of other * OpenSSL structures.
* fields are the same whether or not you build with SSL enabled.)
*/ */
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
SSL *ssl; SSL *ssl;
@ -222,6 +222,9 @@ typedef struct Port
* There's no API to "unread", the upper layer just places the data in the * There's no API to "unread", the upper layer just places the data in the
* Port structure in raw_buf and sets raw_buf_remaining to the amount of * Port structure in raw_buf and sets raw_buf_remaining to the amount of
* bytes unread and raw_buf_consumed to 0. * bytes unread and raw_buf_consumed to 0.
*
* NB: the offsets of these fields depend on USE_OPENSSL. These should
* not be accessed in an extension because of the ABI incompatibility.
*/ */
char *raw_buf; char *raw_buf;
ssize_t raw_buf_consumed, ssize_t raw_buf_consumed,