pg.ddx.io  pgsql-bugs@postgresql.org mailing list archive  
help / color / mirror / Atom feed
From: Alvaro Herrera <alvherre@2ndquadrant.com>
To: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Cc: tgl@sss.pgh.pa.us
Cc: ranier_gyn@hotmail.com
Cc: pgsql-bugs@lists.postgresql.org
Subject: Re: [BUG FIX] Uninitialized var fargtypes used.
Date: Tue, 12 Nov 2019 11:01:29 -0300
Message-ID: <20191112140129.GA7283@alvherre.pgsql> (raw)
In-Reply-To: <20191112.162201.1151793436231414044.horikyota.ntt@gmail.com>

On 2019-Nov-12, Kyotaro Horiguchi wrote:

> At Mon, 11 Nov 2019 12:32:38 -0500, Tom Lane <tgl@sss.pgh.pa.us> wrote in 

> >	/*
> >	 * If no arguments were specified, the name must yield a unique candidate.
> >	 */
> >	if (nargs < 0)
> >	{
> 
> We can change the condition with "nargs <= 0" and it should return the
> only element in clist. If the catalog is broken we may get
> FUNCLOOKUP_AMBIGUOUS but it seems rather the correct behavior.
> 
> This allows argtypes == NULL and makes the caller-side tweak useless.

Yeah, essentially this reverts 0a52d378b03b.  Here's another version of
this I wrote last night.

BTW I also noticed that ProcedureCreate forces its callers to pass a
non-NULL parameterTypes even for 0 args, which seems to be fixed easily
too, something like this:

inline patch 1: src/backend/catalog/pg_proc.c (+1/-1 lines) download inline-1.patchdiff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index ef009ad2bc..547949e534 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -124,7 +124,7 @@ ProcedureCreate(const char *procedureName, */ Assert(PointerIsValid(prosrc)); - parameterCount = parameterTypes->dim1; + parameterCount = parameterTypes == NULL ? 0 : parameterTypes->dim1; if (parameterCount < 0 || parameterCount > FUNC_MAX_ARGS) ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS),
-- Álvaro Herrera https://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services Patches and attachments: download all (2 files, .tar.gz)
nullary.patch (text/x-diff, 4.3K) download commit e0290fb7a8f40b8f129613c20a8d288b72a90cdb Author: Alvaro Herrera <alvherre@alvh.no-ip.org> AuthorDate: Tue Nov 12 10:21:04 2019 -0300 CommitDate: Tue Nov 12 11:00:53 2019 -0300 Fix empty args diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index 6b022af4ab..f021d71a5c 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -171,7 +171,6 @@ CreateEventTrigger(CreateEventTrigStmt *stmt) HeapTuple tuple; Oid funcoid; Oid funcrettype; - Oid fargtypes[1]; /* dummy */ Oid evtowner = GetUserId(); ListCell *lc; List *tags = NULL; @@ -237,7 +236,7 @@ CreateEventTrigger(CreateEventTrigStmt *stmt) stmt->trigname))); /* Find and validate the trigger function. */ - funcoid = LookupFuncName(stmt->funcname, 0, fargtypes, false); + funcoid = LookupFuncName(stmt->funcname, 0, NULL, false); funcrettype = get_func_rettype(funcoid); if (funcrettype != EVTTRIGGEROID) ereport(ERROR, diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index 343cd1dbb0..b51c373b93 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -105,7 +105,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt) * return type. */ funcname = SystemFuncName(pltemplate->tmplhandler); - handlerOid = LookupFuncName(funcname, 0, funcargtypes, true); + handlerOid = LookupFuncName(funcname, 0, NULL, true); if (OidIsValid(handlerOid)) { funcrettype = get_func_rettype(handlerOid); @@ -263,7 +263,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt) * Lookup the PL handler function and check that it is of the expected * return type */ - handlerOid = LookupFuncName(stmt->plhandler, 0, funcargtypes, false); + handlerOid = LookupFuncName(stmt->plhandler, 0, NULL, false); funcrettype = get_func_rettype(handlerOid); if (funcrettype != LANGUAGE_HANDLEROID) { diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index cef6d02f51..84144b46b1 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -179,7 +179,6 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, ScanKeyData key; Relation pgrel; HeapTuple tuple; - Oid fargtypes[1]; /* dummy */ Oid funcrettype; Oid trigoid; char internaltrigname[NAMEDATALEN]; @@ -690,7 +689,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, * Find and validate the trigger function. */ if (!OidIsValid(funcoid)) - funcoid = LookupFuncName(stmt->funcname, 0, fargtypes, false); + funcoid = LookupFuncName(stmt->funcname, 0, NULL, false); if (!isInternal) { aclresult = pg_proc_aclcheck(funcoid, GetUserId(), ACL_EXECUTE); diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 8e926539e6..6f1b7ce422 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -2035,8 +2035,8 @@ LookupFuncNameInternal(List *funcname, int nargs, const Oid *argtypes, { FuncCandidateList clist; - /* Passing NULL for argtypes is no longer allowed */ - Assert(argtypes); + /* NULL argtypes only allowed for nullary functions */ + Assert(argtypes || nargs == 0); /* Always set *lookupError, to forestall uninitialized-variable warnings */ *lookupError = FUNCLOOKUP_NOSUCHFUNC; @@ -2047,7 +2047,7 @@ LookupFuncNameInternal(List *funcname, int nargs, const Oid *argtypes, /* * If no arguments were specified, the name must yield a unique candidate. */ - if (nargs < 0) + if (nargs <= 0) { if (clist) { diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 73e12788fc..e7640008fd 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -592,7 +592,6 @@ call_pltcl_start_proc(Oid prolang, bool pltrusted) const char *gucname; ErrorContextCallback errcallback; List *namelist; - Oid fargtypes[1]; /* dummy */ Oid procOid; HeapTuple procTup; Form_pg_proc procStruct; @@ -616,7 +615,7 @@ call_pltcl_start_proc(Oid prolang, bool pltrusted) /* Parse possibly-qualified identifier and look up the function */ namelist = stringToQualifiedNameList(start_proc); - procOid = LookupFuncName(namelist, 0, fargtypes, false); + procOid = LookupFuncName(namelist, 0, NULL, false); /* Current user must have permission to call function */ aclresult = pg_proc_aclcheck(procOid, GetUserId(), ACL_EXECUTE);

view thread (8+ messages)  latest in thread

Message-ID: <20191112140129.GA7283@alvherre.pgsql>
Permalink:  ../20191112140129.GA7283@alvherre.pgsql/
Also on:    postgresql.org/message-id/20191112140129.GA7283@alvherre.pgsql

 ·  · 

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients from your mail client; the link fills in
  the headers below: reply via email
  Some clients, webmail especially, drop In-Reply-To and References from
  a link, and the reply then starts a new thread: use the mbox below.

  To: pgsql-bugs@postgresql.org
  Cc: alvherre@2ndquadrant.com, horikyota.ntt@gmail.com, tgl@sss.pgh.pa.us, ranier_gyn@hotmail.com
  Subject: Re: [BUG FIX] Uninitialized var fargtypes used.
  In-Reply-To: <20191112140129.GA7283@alvherre.pgsql>
  References: <20191112.162201.1151793436231414044.horikyota.ntt@gmail.com> <20191112140129.GA7283@alvherre.pgsql>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox