Don't malloc(0) in EventTriggerCollectAlterTSConfig

Author: Florin Irion <florin.irion@enterprisedb.com>
Discussion: https://postgr.es/m/c6fff161-9aee-4290-9ada-71e21e4d84de@gmail.com

diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index abfa830042b9c8858382d791f22eccf9ed289830..6ebecbbf6ebe995ba0317c5dc9c516d9c175b306 100644 (file)
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -1905,8 +1905,11 @@ EventTriggerCollectAlterTSConfig(AlterTSConfigurationStmt *stmt, Oid cfgId,
        command->in_extension = creating_extension;
        ObjectAddressSet(command->d.atscfg.address,
                                         TSConfigRelationId, cfgId);
-       command->d.atscfg.dictIds = palloc(sizeof(Oid) * ndicts);
-       memcpy(command->d.atscfg.dictIds, dictIds, sizeof(Oid) * ndicts);
+       if (ndicts > 0)
+       {
+               command->d.atscfg.dictIds = palloc_array(Oid, ndicts);
+               memcpy(command->d.atscfg.dictIds, dictIds, sizeof(Oid) * ndicts);
+       }
        command->d.atscfg.ndicts = ndicts;
        command->parsetree = (Node *) copyObject(stmt);
 

diff --git a/src/test/modules/test_ddl_deparse/Makefile b/src/test/modules/test_ddl_deparse/Makefile
index 3a57a95c84969e9f22bd7066b79e3191cad2a712..4576ed31e208709116571c71fc7e6ab9ca324795 100644 (file)
--- a/src/test/modules/test_ddl_deparse/Makefile
+++ b/src/test/modules/test_ddl_deparse/Makefile
@@ -27,6 +27,7 @@ REGRESS = test_ddl_deparse \
        alter_type_enum \
        opfamily \
        defprivs \
+       textsearch \
        matviews
 
 EXTRA_INSTALL = contrib/pg_stat_statements

diff --git a/src/test/modules/test_ddl_deparse/expected/textsearch.out b/src/test/modules/test_ddl_deparse/expected/textsearch.out
new file mode 100644 (file)
index 0000000..da0d89e
--- /dev/null
+++ b/src/test/modules/test_ddl_deparse/expected/textsearch.out
@@ -0,0 +1,5 @@
+CREATE TEXT SEARCH CONFIGURATION evttrig_tscfg (COPY = pg_catalog.simple);
+NOTICE:  DDL test: type simple, tag CREATE TEXT SEARCH CONFIGURATION
+ALTER TEXT SEARCH CONFIGURATION evttrig_tscfg
+    DROP MAPPING FOR word;
+NOTICE:  DDL test: type alter text search configuration, tag ALTER TEXT SEARCH CONFIGURATION

diff --git a/src/test/modules/test_ddl_deparse/meson.build b/src/test/modules/test_ddl_deparse/meson.build
index dfd31df12435dcb50fd85e28549dd711dc4ca7dd..0223d99d38244ef012273849e015e84d8fdd7057 100644 (file)
--- a/src/test/modules/test_ddl_deparse/meson.build
+++ b/src/test/modules/test_ddl_deparse/meson.build
@@ -47,6 +47,7 @@ tests += {
       'alter_type_enum',
       'opfamily',
       'defprivs',
+      'textsearch',
       'matviews',
     ],
   },

diff --git a/src/test/modules/test_ddl_deparse/sql/textsearch.sql b/src/test/modules/test_ddl_deparse/sql/textsearch.sql
new file mode 100644 (file)
index 0000000..633899a
--- /dev/null
+++ b/src/test/modules/test_ddl_deparse/sql/textsearch.sql
@@ -0,0 +1,3 @@
+CREATE TEXT SEARCH CONFIGURATION evttrig_tscfg (COPY = pg_catalog.simple);
+ALTER TEXT SEARCH CONFIGURATION evttrig_tscfg
+    DROP MAPPING FOR word;