Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iUWjk-0006sV-0N for pgsql-bugs@arkaria.postgresql.org; Tue, 12 Nov 2019 14:01:40 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1iUWji-0006Ur-Kg for pgsql-bugs@arkaria.postgresql.org; Tue, 12 Nov 2019 14:01:38 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iUWji-0006Uk-9m for pgsql-bugs@lists.postgresql.org; Tue, 12 Nov 2019 14:01:38 +0000 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iUWjf-00024Z-90 for pgsql-bugs@lists.postgresql.org; Tue, 12 Nov 2019 14:01:37 +0000 Received: by mail-qk1-x744.google.com with SMTP id e187so14485214qkf.4 for ; Tue, 12 Nov 2019 06:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=2ndquadrant-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=WcIwHvxHrj+IUkEnOsuqf61/g2CrKwQOIIZSLi679BI=; b=1snRl2YbEEwg7XQndEZgUkJ2bTTYjRJDuqBrJIG1unEeABbyk0Un1kcrbD6VuoA/uR V1BqcHNBj3R0L0ggET7zKcQcCPGibsGFmfJmWu+MwM78ysFij1oEtnQrqq4iGhgqpsL8 4aIZGzJn2wbeEAVt7BPMHRuU3qRAWVYCZW+E48mDWEDPxG8MsB0jVhDlz/iwB6AbBnDX NhWiKkJtq+q7p4g6J4rv1OdYhAIFQSO6La2XYmZQK6Ba+tu342hK1/3KxGAT7rEG2eQL bcnxXxyzYopE5tgWpZi3ku9+H9FahFbfWXwraj7nqUDTdMMqWsxlRET6q9KTINr99MQJ CFrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=WcIwHvxHrj+IUkEnOsuqf61/g2CrKwQOIIZSLi679BI=; b=dpCROLj/f8I+hGsP4Py7M8ab+FKNDjkpjnjP4gthz9Ujr31Z14hwngGeWbEWLuSOTV nWKyH0ptTNmUTG1/8tLTvjRarA/O1Rg4BjJfBT4ZBq84EDIvYFGANRaD6B7zSsrlVTjd QEo7hXYDxVhN9kJTW6AjcXxnanOR+ujeUN6010q+8+5rnsfqWuSpOePjkkUGkTne22/w mhRBKzq0CAW3VZ7urQWJLOVlMjAjJe/Z2oJHe+VquidlmdYkjFtuJd63UAwufIOTXvOk uX1BwjTAf5iJTOzudYRXodIoF83PiX+ogZoc/bACrf0sBSpu8sERGnopEfnYAG/2wCXH 8nMw== X-Gm-Message-State: APjAAAXA2eMHAHN2F2gB0hNH+T0COtExiCmQou6XFPy3O3vrtdLjFNfU cONwZgqmXXP7OgNmPsPmLaKy9g== X-Google-Smtp-Source: APXvYqwkB3VtBSQIaDDC7vF3T99iK15MEMByZ0L/g+Ub4qzn+p/9xfk43r0gz0hrY4SXT5j3s4tarA== X-Received: by 2002:a37:6ec4:: with SMTP id j187mr5862246qkc.193.1573567293397; Tue, 12 Nov 2019 06:01:33 -0800 (PST) Received: from nimloth.alvh.no-ip.org ([190.95.19.128]) by smtp.gmail.com with ESMTPSA id b10sm8374406qkh.69.2019.11.12.06.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 06:01:31 -0800 (PST) Received: by nimloth.alvh.no-ip.org (Postfix, from userid 1000) id 7FDB4300AA4; Tue, 12 Nov 2019 11:01:29 -0300 (-03) Date: Tue, 12 Nov 2019 11:01:29 -0300 From: Alvaro Herrera To: Kyotaro Horiguchi Cc: tgl@sss.pgh.pa.us, ranier_gyn@hotmail.com, pgsql-bugs@lists.postgresql.org Subject: Re: [BUG FIX] Uninitialized var fargtypes used. Message-ID: <20191112140129.GA7283@alvherre.pgsql> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="zhXaljGHf11kAtnf" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191112.162201.1151793436231414044.horikyota.ntt@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --zhXaljGHf11kAtnf Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit On 2019-Nov-12, Kyotaro Horiguchi wrote: > At Mon, 11 Nov 2019 12:32:38 -0500, Tom Lane 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: diff --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 --zhXaljGHf11kAtnf Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="nullary.patch" commit e0290fb7a8f40b8f129613c20a8d288b72a90cdb Author: Alvaro Herrera 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); --zhXaljGHf11kAtnf--