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

Check for malloc failure.

Browse Source
This commit is contained in:
Tom Lane
2001-06-01 20:29:43 +00:00
parent ddd96e1f21
commit c6b1ef8fe7
3 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/utils/init/miscinit.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.67 2001/05/18 17:49:52 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.68 2001/06/01 20:27:41 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -143,14 +143,18 @@ SetDataDir(const char *dir)
}
new = malloc(strlen(buf) + 1 + strlen(dir) + 1);
if (!new)
elog(FATAL, "out of memory");
sprintf(new, "%s/%s", buf, dir);
free(buf);
}
else
{
new = strdup(dir);
if (!new)
elog(FATAL, "out of memory");
}
if (!new)
elog(FATAL, "out of memory");
DataDir = new;
}
@@ -278,10 +282,15 @@ SetCharSet()
{
map_file = (char *) malloc((strlen(DataDir) +
strlen(p) + 2) * sizeof(char));
if (! map_file)
elog(FATAL, "out of memory");
sprintf(map_file, "%s/%s", DataDir, p);
file = AllocateFile(map_file, PG_BINARY_R);
if (file == NULL)
{
free(map_file);
return;
}
eof = false;
while (!eof)
{