Improve check for overly-long extensible node name.

robertmhaas · robertmhaas · commit 3adf9ced17df · 2016-03-14T13:52:52.000-04:00
The old code is bad for two reasons.  First, it has an off-by-one
error.  Second, it won't help if you aren't running with assertions
enabled.  Per discussion, we want a check here in that case too.

Author: KaiGai Kohei, adjusted by me.
Reviewed-by: Petr Jelinek
Discussion: 56E0D547.1030101@2ndquadrant.com
diff --git a/src/backend/nodes/extensible.c b/src/backend/nodes/extensible.c
@@ -51,7 +51,8 @@ RegisterExtensibleNodeMethods(const ExtensibleNodeMethods *methods)
 											  100, &ctl, HASH_ELEM);
 	}
 
-	Assert(strlen(methods->extnodename) <= EXTNODENAME_MAX_LEN);
+	if (strlen(methods->extnodename) >= EXTNODENAME_MAX_LEN)
+		elog(ERROR, "extensible node name is too long");
 
 	entry = (ExtensibleNodeEntry *) hash_search(extensible_node_methods,
 												methods->extnodename,

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ RegisterExtensibleNodeMethods(const ExtensibleNodeMethods *methods)`
`51`	`51`	`100, &ctl, HASH_ELEM);`
`52`	`52`	`}`
`53`	`53`
`54`		`- Assert(strlen(methods->extnodename) <= EXTNODENAME_MAX_LEN);`
	`54`	`+ if (strlen(methods->extnodename) >= EXTNODENAME_MAX_LEN)`
	`55`	`+ elog(ERROR, "extensible node name is too long");`
`55`	`56`
`56`	`57`	`entry = (ExtensibleNodeEntry *) hash_search(extensible_node_methods,`
`57`	`58`	`methods->extnodename,`