Fix for NOTIFY when NAMEDATALEN is nonstandard in server. Fix idea from

Tom Lane to move string storage to end of structure but keep pointer in
the same location.
ecpg_big_bison
Bruce Momjian 24 years ago
parent 394eec1068
commit 5b92d004fa
  1. 14
      src/interfaces/libpq/fe-exec.c
  2. 5
      src/interfaces/libpq/libpq-fe.h

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.118 2002/04/08 03:48:10 ishii Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.119 2002/04/15 23:35:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1510,8 +1510,16 @@ getNotify(PGconn *conn)
return EOF;
if (pqGets(&conn->workBuffer, conn))
return EOF;
newNotify = (PGnotify *) malloc(sizeof(PGnotify));
strncpy(newNotify->relname, conn->workBuffer.data, NAMEDATALEN);
/*
* Store the relation name right after the PQnotify structure so it can
* all be freed at once. We don't use NAMEDATALEN because we don't
* want to tie this interface to a specific server name length.
*/
newNotify = (PGnotify *) malloc(sizeof(PGnotify) +
strlen(conn->workBuffer.data) + 1);
newNotify->relname = (char *)newNotify + sizeof(PGnotify);
strcpy(newNotify->relname, conn->workBuffer.data);
newNotify->be_pid = be_pid;
DLAddTail(conn->notifyList, DLNewElem(newNotify));
return 0;

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: libpq-fe.h,v 1.83 2002/03/05 06:07:26 momjian Exp $
* $Id: libpq-fe.h,v 1.84 2002/04/15 23:35:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -105,8 +105,7 @@ typedef struct pg_result PGresult;
*/
typedef struct pgNotify
{
char relname[NAMEDATALEN]; /* name of relation containing
* data */
char *relname; /* name of relation containing data */
int be_pid; /* process id of backend */
} PGnotify;

Loading…
Cancel
Save