Fix bogus Name assignment in CreateStatistics

Apparently, it doesn't work to use a plain cstring as a Name datum: you
may end up having random bytes because of failing to zero the bytes
after the terminating \0, as indicated by valgrind.  I introduced this
bug in 5564c1181548, so backpatch this fix to REL_10_STABLE, like that
commit.

While at it, fix a slightly misleading comment, pointed out by David
Rowley.

diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c
index f46ef01134f7f220636fa36c03cea512fa08f982..c4adfd569ea5b1b8560b044d872cf3ef8586e703 100644 (file)
--- a/src/backend/commands/statscmds.c
+++ b/src/backend/commands/statscmds.c
@@ -57,6 +57,7 @@ CreateStatistics(CreateStatsStmt *stmt)
        int16           attnums[STATS_MAX_DIMENSIONS];
        int                     numcols = 0;
        char       *namestr;
+       NameData        stxname;
        Oid                     statoid;
        Oid                     namespaceId;
        Oid                     stxowner = GetUserId();
@@ -135,7 +136,8 @@ CreateStatistics(CreateStatsStmt *stmt)
         * object in the same namespace as the relation, and cons up a name for it.
         */
        if (stmt->defnames)
-               namespaceId = QualifiedNameGetCreationNamespace(stmt->defnames, &namestr);
+               namespaceId = QualifiedNameGetCreationNamespace(stmt->defnames,
+                                                                                                               &namestr);
        else
        {
                namespaceId = RelationGetNamespace(rel);
@@ -144,6 +146,7 @@ CreateStatistics(CreateStatsStmt *stmt)
                                                                                          "stat",
                                                                                          namespaceId);
        }
+       namestrcpy(&stxname, namestr);
 
        /*
         * Deal with the possibility that the statistics object already exists.
@@ -307,7 +310,7 @@ CreateStatistics(CreateStatsStmt *stmt)
        memset(values, 0, sizeof(values));
        memset(nulls, false, sizeof(nulls));
        values[Anum_pg_statistic_ext_stxrelid - 1] = ObjectIdGetDatum(relid);
-       values[Anum_pg_statistic_ext_stxname - 1] = CStringGetDatum(namestr);
+       values[Anum_pg_statistic_ext_stxname - 1] = NameGetDatum(&stxname);
        values[Anum_pg_statistic_ext_stxnamespace - 1] = ObjectIdGetDatum(namespaceId);
        values[Anum_pg_statistic_ext_stxowner - 1] = ObjectIdGetDatum(stxowner);
        values[Anum_pg_statistic_ext_stxkeys - 1] = PointerGetDatum(stxkeys);

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 8c7bd686397d737e4ef1b567ebbfe4e66ba5db17..0fd14f43c6beefec7a1b4e74c857fa9b6ecbd606 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -2250,7 +2250,8 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
  * transformExtendedStatistics
  *     Handle extended statistic objects
  *
- * Right now, there's nothing to do here, so we just copy the list.
+ * Right now, there's nothing to do here, so we just append the list to
+ * the existing "after" list.
  */
 static void
 transformExtendedStatistics(CreateStmtContext *cxt)