database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-11 10:01:57 +03:00
Code Activity

Portability fix for old SunOS releases: realloc(NULL, ...)

Browse Source 
doesn't work there.
This commit is contained in:
Tom Lane
1998-11-29 01:54:34 +00:00
parent 9fc69f5a67
commit 594bee4844
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/interfaces/libpq/fe-exec.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.69 1998/10/01 01:40:21 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.69.2.1 1998/11/29 01:54:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -214,17 +214,23 @@ addTuple(PGresult *res, PGresAttValue *tup)
* *
* We can use realloc because shallow copying of the structure is * We can use realloc because shallow copying of the structure is
* okay. Note that the first time through, res->tuples is NULL. * okay. Note that the first time through, res->tuples is NULL.
* realloc is supposed to do the right thing in that case. Also, * While ANSI says that realloc() should act like malloc() in that
* on failure realloc is supposed to return NULL without damaging * case, some old C libraries (like SunOS 4.1.x) coredump instead.
* On failure realloc is supposed to return NULL without damaging
* the existing allocation. * the existing allocation.
* Note that the positions beyond res->ntups are garbage, not * Note that the positions beyond res->ntups are garbage, not
* necessarily NULL. * necessarily NULL.
*/ */
int newSize = res->tupArrSize + TUPARR_GROW_BY; int newSize = res->tupArrSize + TUPARR_GROW_BY;
PGresAttValue ** newTuples = (PGresAttValue **) PGresAttValue ** newTuples;
realloc(res->tuples, newSize * sizeof(PGresAttValue *)); if (res->tuples == NULL)
newTuples = (PGresAttValue **)
malloc(newSize * sizeof(PGresAttValue *));
else
newTuples = (PGresAttValue **)
realloc(res->tuples, newSize * sizeof(PGresAttValue *));
if (! newTuples) if (! newTuples)
return FALSE; /* realloc failed */ return FALSE; /* malloc or realloc failed */
res->tupArrSize = newSize; res->tupArrSize = newSize;
res->tuples = newTuples; res->tuples = newTuples;
} }