database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Revert patch that removed BUFSIZ usage. The memory has to hold the

Browse Source 
structures plus pointers used by the structure.
This commit is contained in:
Bruce Momjian
2004-09-28 00:07:01 +00:00
parent dd67707a64
commit 1ad6878276
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-auth.c
View File

@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.92 2004/09/27 23:38:45 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.93 2004/09/28 00:06:02 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -749,7 +749,7 @@ fe_getauthname(char *PQerrormsg)
if (GetUserName(username, &namesize)) if (GetUserName(username, &namesize))
name = username; name = username;
#else #else
char pwdbuf[sizeof(struct passwd)]; char pwdbuf[BUFSIZ];
struct passwd pwdstr; struct passwd pwdstr;
struct passwd *pw = NULL; struct passwd *pw = NULL;

10
src/interfaces/libpq/fe-secure.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.53 2004/09/27 23:38:45 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.54 2004/09/28 00:06:02 momjian Exp $
* *
* NOTES * NOTES
* [ Most of these notes are wrong/obsolete, but perhaps not all ] * [ Most of these notes are wrong/obsolete, but perhaps not all ]
@ -512,7 +512,7 @@ verify_peer(PGconn *conn)
{ {
struct hostent hpstr; struct hostent hpstr;
char buf[sizeof(struct hostent)]; char buf[BUFSIZ];
int herrno = 0; int herrno = 0;
/* /*
@ -598,7 +598,7 @@ load_dh_file(int keylength)
#ifdef WIN32 #ifdef WIN32
return NULL; return NULL;
#else #else
char pwdbuf[sizeof(struct passwd)]; char pwdbuf[BUFSIZ];
struct passwd pwdstr; struct passwd pwdstr;
struct passwd *pwd = NULL; struct passwd *pwd = NULL;
FILE *fp; FILE *fp;
@ -745,7 +745,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
#ifdef WIN32 #ifdef WIN32
return 0; return 0;
#else #else
char pwdbuf[sizeof(struct passwd)]; char pwdbuf[BUFSIZ];
struct passwd pwdstr; struct passwd pwdstr;
struct passwd *pwd = NULL; struct passwd *pwd = NULL;
struct stat buf, struct stat buf,
@ -952,7 +952,7 @@ initialize_SSL(PGconn *conn)
{ {
#ifndef WIN32 #ifndef WIN32
struct stat buf; struct stat buf;
char pwdbuf[sizeof(struct passwd)]; char pwdbuf[BUFSIZ];
struct passwd pwdstr; struct passwd pwdstr;
struct passwd *pwd = NULL; struct passwd *pwd = NULL;
char fnbuf[MAXPGPATH]; char fnbuf[MAXPGPATH];

4
src/port/getaddrinfo.c
View File

@ -12,7 +12,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.14 2004/09/27 23:39:14 momjian Exp $ * $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.15 2004/09/28 00:07:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -85,7 +85,7 @@ getaddrinfo(const char *node, const char *service,
#ifdef FRONTEND #ifdef FRONTEND
struct hostent hpstr; struct hostent hpstr;
char buf[sizeof(struct hostent)]; char buf[BUFSIZ];
int herrno = 0; int herrno = 0;
pqGethostbyname(node, &hpstr, buf, sizeof(buf), pqGethostbyname(node, &hpstr, buf, sizeof(buf),

4
src/port/thread.c
View File

@ -7,7 +7,7 @@
* *
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/port/thread.c,v 1.27 2004/09/27 23:39:14 momjian Exp $ * $PostgreSQL: pgsql/src/port/thread.c,v 1.28 2004/09/28 00:07:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -103,6 +103,7 @@ pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,
/* POSIX version */ /* POSIX version */
getpwuid_r(uid, resultbuf, buffer, buflen, result); getpwuid_r(uid, resultbuf, buffer, buflen, result);
#else #else
/* /*
* Early POSIX draft of getpwuid_r() returns 'struct passwd *'. * Early POSIX draft of getpwuid_r() returns 'struct passwd *'.
* getpwuid_r(uid, resultbuf, buffer, buflen) * getpwuid_r(uid, resultbuf, buffer, buflen)
@ -110,6 +111,7 @@ pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,
*result = getpwuid_r(uid, resultbuf, buffer, buflen); *result = getpwuid_r(uid, resultbuf, buffer, buflen);
#endif #endif
#else #else
/* no getpwuid_r() available, just use getpwuid() */ /* no getpwuid_r() available, just use getpwuid() */
*result = getpwuid(uid); *result = getpwuid(uid);
#endif #endif