database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Fix various confusions of pointers and OIDs, unsafe assumptions about nulls,

Browse Source 
etc.  I think this will fix the current buildfarm issues ...
This commit is contained in:
Tom Lane 2008-12-20 15:51:28 +00:00
parent cef8efc62d
commit a1212d09a1
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/backend/commands/foreigncmds.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/foreigncmds.c,v 1.2 2008/12/20 09:40:56 heikki Exp $ * $PostgreSQL: pgsql/src/backend/commands/foreigncmds.c,v 1.3 2008/12/20 15:51:28 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,6 +35,8 @@
/* /*
* Convert a DefElem list to the text array format that is used in * Convert a DefElem list to the text array format that is used in
* pg_foreign_data_wrapper, pg_foreign_server, and pg_user_mapping. * pg_foreign_data_wrapper, pg_foreign_server, and pg_user_mapping.
* Returns the array in the form of a Datum, or PointerGetDatum(NULL)
* if the list is empty.
* *
* Note: The array is usually stored to database without further * Note: The array is usually stored to database without further
* processing, hence any validation should be done before this * processing, hence any validation should be done before this
@ -45,13 +47,13 @@ optionListToArray(List *options)
{ {
ArrayBuildState *astate = NULL; ArrayBuildState *astate = NULL;
ListCell *cell; ListCell *cell;
text *t;
foreach (cell, options) foreach(cell, options)
{ {
DefElem *def = lfirst(cell); DefElem *def = lfirst(cell);
const char *value = ""; const char *value;
Size len; Size len;
text *t;
value = defGetString(def); value = defGetString(def);
len = VARHDRSZ + strlen(def->defname) + 1 + strlen(value); len = VARHDRSZ + strlen(def->defname) + 1 + strlen(value);
@ -76,6 +78,9 @@ optionListToArray(List *options)
* The result is converted to array of text suitable for storing in * The result is converted to array of text suitable for storing in
* options. * options.
* *
* Returns the array in the form of a Datum, or PointerGetDatum(NULL)
* if the list is empty.
*
* This is used by CREATE/ALTER of FOREIGN DATA WRAPPER/SERVER/USER * This is used by CREATE/ALTER of FOREIGN DATA WRAPPER/SERVER/USER
* MAPPING. In the ALTER cases, oldOptions is the current text array * MAPPING. In the ALTER cases, oldOptions is the current text array
* of options. * of options.
@ -90,15 +95,15 @@ transformGenericOptions(Datum oldOptions,
List *resultOptions = untransformRelOptions(oldOptions); List *resultOptions = untransformRelOptions(oldOptions);
ListCell *optcell; ListCell *optcell;
foreach (optcell, optionDefList) foreach(optcell, optionDefList)
{ {
OptionDefElem *od = lfirst(optcell);
ListCell *cell; ListCell *cell;
ListCell *prev = NULL; ListCell *prev = NULL;
OptionDefElem *od = lfirst(optcell);
/* /*
* Find the element in resultOptions. We need this for * Find the element in resultOptions. We need this for
* validation in all cases. * validation in all cases. Also identify the previous element.
*/ */
foreach (cell, resultOptions) foreach (cell, resultOptions)
{ {
@ -190,7 +195,6 @@ AlterForeignDataWrapperOwner(const char *name, Oid newOwnerId)
HeapTuple tup; HeapTuple tup;
Relation rel; Relation rel;
Oid fdwId; Oid fdwId;
Form_pg_foreign_data_wrapper form; Form_pg_foreign_data_wrapper form;
/* Must be a superuser to change a FDW owner */ /* Must be a superuser to change a FDW owner */
@ -345,7 +349,8 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
*/ */
rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock); rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
MemSet(nulls, false, Natts_pg_foreign_data_wrapper); memset(values, 0, sizeof(values));
memset(nulls, false, sizeof(nulls));
values[Anum_pg_foreign_data_wrapper_fdwname - 1] = values[Anum_pg_foreign_data_wrapper_fdwname - 1] =
DirectFunctionCall1(namein, CStringGetDatum(stmt->fdwname)); DirectFunctionCall1(namein, CStringGetDatum(stmt->fdwname));
@ -359,7 +364,8 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
*/ */
fdwlib = GetForeignDataWrapperLibrary(stmt->library); fdwlib = GetForeignDataWrapperLibrary(stmt->library);
fdwoptions = transformGenericOptions(0, stmt->options, FdwOpt, NULL, fdwoptions = transformGenericOptions(PointerGetDatum(NULL), stmt->options,
FdwOpt, NULL,
fdwlib->validateOptionList); fdwlib->validateOptionList);
if (PointerIsValid(DatumGetPointer(fdwoptions))) if (PointerIsValid(DatumGetPointer(fdwoptions)))
@ -447,6 +453,7 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt)
tp, tp,
Anum_pg_foreign_data_wrapper_fdwlibrary, Anum_pg_foreign_data_wrapper_fdwlibrary,
&isnull); &isnull);
Assert(!isnull);
fdwlib = GetForeignDataWrapperLibrary(TextDatumGetCString(datum)); fdwlib = GetForeignDataWrapperLibrary(TextDatumGetCString(datum));
} }
@ -460,13 +467,15 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt)
tp, tp,
Anum_pg_foreign_data_wrapper_fdwoptions, Anum_pg_foreign_data_wrapper_fdwoptions,
&isnull); &isnull);
if (isnull)
datum = PointerGetDatum(NULL);
/* Transform the options */ /* Transform the options */
datum = transformGenericOptions(datum, stmt->options, FdwOpt, datum = transformGenericOptions(datum, stmt->options, FdwOpt,
NULL, fdwlib->validateOptionList); NULL, fdwlib->validateOptionList);
if (PointerIsValid(DatumGetPointer(datum))) if (PointerIsValid(DatumGetPointer(datum)))
repl_val[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = ObjectIdGetDatum(datum); repl_val[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = datum;
else else
repl_null[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = true; repl_null[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = true;
@ -603,7 +612,8 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
*/ */
rel = heap_open(ForeignServerRelationId, RowExclusiveLock); rel = heap_open(ForeignServerRelationId, RowExclusiveLock);
MemSet(nulls, false, Natts_pg_foreign_server); memset(values, 0, sizeof(values));
memset(nulls, false, sizeof(nulls));
values[Anum_pg_foreign_server_srvname - 1] = values[Anum_pg_foreign_server_srvname - 1] =
DirectFunctionCall1(namein, CStringGetDatum(stmt->servername)); DirectFunctionCall1(namein, CStringGetDatum(stmt->servername));
@ -628,7 +638,8 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
nulls[Anum_pg_foreign_server_srvacl - 1] = true; nulls[Anum_pg_foreign_server_srvacl - 1] = true;
/* Add server options */ /* Add server options */
srvoptions = transformGenericOptions(0, stmt->options, ServerOpt, fdw, srvoptions = transformGenericOptions(PointerGetDatum(NULL), stmt->options,
ServerOpt, fdw,
fdw->lib->validateOptionList); fdw->lib->validateOptionList);
if (PointerIsValid(DatumGetPointer(srvoptions))) if (PointerIsValid(DatumGetPointer(srvoptions)))
@ -722,6 +733,8 @@ AlterForeignServer(AlterForeignServerStmt *stmt)
tp, tp,
Anum_pg_foreign_server_srvoptions, Anum_pg_foreign_server_srvoptions,
&isnull); &isnull);
if (isnull)
datum = PointerGetDatum(NULL);
/* Prepare the options array */ /* Prepare the options array */
datum = transformGenericOptions(datum, stmt->options, ServerOpt, datum = transformGenericOptions(datum, stmt->options, ServerOpt,
@ -868,13 +881,15 @@ CreateUserMapping(CreateUserMappingStmt *stmt)
*/ */
rel = heap_open(UserMappingRelationId, RowExclusiveLock); rel = heap_open(UserMappingRelationId, RowExclusiveLock);
MemSet(nulls, false, Natts_pg_user_mapping); memset(values, 0, sizeof(values));
memset(nulls, false, sizeof(nulls));
values[Anum_pg_user_mapping_umuser - 1] = ObjectIdGetDatum(useId); values[Anum_pg_user_mapping_umuser - 1] = ObjectIdGetDatum(useId);
values[Anum_pg_user_mapping_umserver - 1] = ObjectIdGetDatum(srv->serverid); values[Anum_pg_user_mapping_umserver - 1] = ObjectIdGetDatum(srv->serverid);
/* Add user options */ /* Add user options */
useoptions = transformGenericOptions(0, stmt->options, UserMappingOpt, useoptions = transformGenericOptions(PointerGetDatum(NULL), stmt->options,
UserMappingOpt,
fdw, fdw->lib->validateOptionList); fdw, fdw->lib->validateOptionList);
if (PointerIsValid(DatumGetPointer(useoptions))) if (PointerIsValid(DatumGetPointer(useoptions)))
@ -931,12 +946,10 @@ AlterUserMapping(AlterUserMappingStmt *stmt)
ObjectIdGetDatum(srv->serverid), ObjectIdGetDatum(srv->serverid),
0, 0); 0, 0);
if (!OidIsValid(umId)) if (!OidIsValid(umId))
{
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT), (errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("user mapping \"%s\" does not exist for the server", errmsg("user mapping \"%s\" does not exist for the server",
MappingUserName(useId)))); MappingUserName(useId))));
}
/* /*
* Must be owner of the server to alter user mapping. * Must be owner of the server to alter user mapping.
@ -972,6 +985,8 @@ AlterUserMapping(AlterUserMappingStmt *stmt)
tp, tp,
Anum_pg_user_mapping_umoptions, Anum_pg_user_mapping_umoptions,
&isnull); &isnull);
if (isnull)
datum = PointerGetDatum(NULL);
/* Prepare the options array */ /* Prepare the options array */
datum = transformGenericOptions(datum, stmt->options, UserMappingOpt, datum = transformGenericOptions(datum, stmt->options, UserMappingOpt,