open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The correct min buffer size is

Browse Source 
INITIAL_EXPBUFFER_SIZE, not PQERRORMSG_LENGTH.

Backpatch only, the proper fix in HEAD is
to use PQExpBuffers everywhere.
REL8_1_STABLE
Magnus Hagander 19 years ago
parent 987b0664fb
commit b25d3e4db0
3 changed files with 22 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      src/interfaces/libpq/fe-auth.c
  2. 4
      src/interfaces/libpq/fe-connect.c
  3. 3
      src/interfaces/libpq/libpq-int.h

38
src/interfaces/libpq/fe-auth.c
Unescape View File

@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.107.2.2 2006/03/06 17:59:42 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.107.2.3 2007/07/23 18:13:02 mha Exp $
*
*-------------------------------------------------------------------------
*/
@ -130,7 +130,7 @@ pg_krb5_init(char *PQerrormsg, struct krb5_info *info)
retval = krb5_init_context(&(info->pg_krb5_context));
if (retval)
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_krb5_init: krb5_init_context: %s\n",
error_message(retval));
return STATUS_ERROR;
@ -139,7 +139,7 @@ pg_krb5_init(char *PQerrormsg, struct krb5_info *info)
retval = krb5_cc_default(info->pg_krb5_context, &(info->pg_krb5_ccache));
if (retval)
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_krb5_init: krb5_cc_default: %s\n",
error_message(retval));
krb5_free_context(info->pg_krb5_context);
@ -150,7 +150,7 @@ pg_krb5_init(char *PQerrormsg, struct krb5_info *info)
&(info->pg_krb5_client));
if (retval)
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_krb5_init: krb5_cc_get_principal: %s\n",
error_message(retval));
krb5_cc_close(info->pg_krb5_context, info->pg_krb5_ccache);
@ -161,7 +161,7 @@ pg_krb5_init(char *PQerrormsg, struct krb5_info *info)
retval = krb5_unparse_name(info->pg_krb5_context, info->pg_krb5_client, &(info->pg_krb5_name));
if (retval)
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_krb5_init: krb5_unparse_name: %s\n",
error_message(retval));
krb5_free_principal(info->pg_krb5_context, info->pg_krb5_client);
@ -224,7 +224,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s
if (!hostname)
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_krb5_sendauth: hostname must be specified for Kerberos authentication\n");
return STATUS_ERROR;
}
@ -237,7 +237,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s
KRB5_NT_SRV_HST, &server);
if (retval)
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_krb5_sendauth: krb5_sname_to_principal: %s\n",
error_message(retval));
pg_krb5_destroy(&info);
@ -253,7 +253,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s
{
char sebuf[256];
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("could not set socket to blocking mode: %s\n"), pqStrerror(errno, sebuf, sizeof(sebuf)));
krb5_free_principal(info.pg_krb5_context, server);
pg_krb5_destroy(&info);
@ -271,11 +271,11 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s
if (retval == KRB5_SENDAUTH_REJECTED && err_ret)
{
#if defined(HAVE_KRB5_ERROR_TEXT_DATA)
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("Kerberos 5 authentication rejected: %*s\n"),
(int) err_ret->text.length, err_ret->text.data);
#elif defined(HAVE_KRB5_ERROR_E_DATA)
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("Kerberos 5 authentication rejected: %*s\n"),
(int) err_ret->e_data->length,
(const char *) err_ret->e_data->data);
@ -285,7 +285,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s
}
else
{
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"krb5_sendauth: %s\n", error_message(retval));
}
@ -301,7 +301,7 @@ pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname, const char *s
{
char sebuf[256];
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("could not restore non-blocking mode on socket: %s\n"),
pqStrerror(errno, sebuf, sizeof(sebuf)));
ret = STATUS_ERROR;
@ -363,14 +363,14 @@ pg_local_sendauth(char *PQerrormsg, PGconn *conn)
{
char sebuf[256];
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"pg_local_sendauth: sendmsg: %s\n",
pqStrerror(errno, sebuf, sizeof(sebuf)));
return STATUS_ERROR;
}
return STATUS_OK;
#else
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("SCM_CRED authentication method not supported\n"));
return STATUS_ERROR;
#endif
@ -456,7 +456,7 @@ pg_fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
break;
case AUTH_REQ_KRB4:
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("Kerberos 4 authentication not supported\n"));
return STATUS_ERROR;
@ -473,7 +473,7 @@ pg_fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
pgunlock_thread();
break;
#else
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("Kerberos 5 authentication not supported\n"));
return STATUS_ERROR;
#endif
@ -483,13 +483,13 @@ pg_fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
case AUTH_REQ_PASSWORD:
if (password == NULL || *password == '\0')
{
(void) snprintf(PQerrormsg, PQERRORMSG_LENGTH,
(void) snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
PQnoPasswordSupplied);
return STATUS_ERROR;
}
if (pg_password_sendauth(conn, password, areq) != STATUS_OK)
{
(void) snprintf(PQerrormsg, PQERRORMSG_LENGTH,
(void) snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
"fe_sendauth: error sending password authentication\n");
return STATUS_ERROR;
}
@ -501,7 +501,7 @@ pg_fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
break;
default:
snprintf(PQerrormsg, PQERRORMSG_LENGTH,
snprintf(PQerrormsg, INITIAL_EXPBUFFER_SIZE,
libpq_gettext("authentication method %u not supported\n"), areq);
return STATUS_ERROR;
}

4
src/interfaces/libpq/fe-connect.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.323.2.2 2006/05/21 20:19:44 tgl Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.323.2.3 2007/07/23 18:13:02 mha Exp $
*
*-------------------------------------------------------------------------
*/
@ -2495,7 +2495,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage)
char *cp2;
PQconninfoOption *options;
PQconninfoOption *option;
char errortmp[PQERRORMSG_LENGTH];
char errortmp[INITIAL_EXPBUFFER_SIZE];
/* Make a working copy of PQconninfoOptions */
options = malloc(sizeof(PQconninfoOptions));

3
src/interfaces/libpq/libpq-int.h
Unescape View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.108.2.2 2006/05/21 20:19:44 tgl Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.108.2.3 2007/07/23 18:13:02 mha Exp $
*
*-------------------------------------------------------------------------
*/
@ -57,7 +57,6 @@ typedef int ssize_t; /* ssize_t doesn't exist in VC (at least not
/*
* POSTGRES backend dependent Constants.
*/
#define PQERRORMSG_LENGTH 1024
#define CMDSTATUS_LEN 40
/*

Write Preview
Loading…
Cancel
Save