Commita7db71e

Amit Kapila

committed

Fix uninitialized slot array access during the upgrade.

Commit29d0a77 introduced fetching slot information from the old clusterbut didn't initialize the required array in all the code paths. So whentrying to access the array in verbose mode for the new cluster, it leadsto an uninitialized memory access.Author: Vignesh CDiscussion:http://postgr.es/m/CALDaNm1tntGP5=CtMz=v+k3_PGv7kE9t6iWSgX-QiurAaFkhZw@mail.gmail.com

1 parent108161b commita7db71eCopy full SHA for a7db71e

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ get_db_infos(ClusterInfo *cluster)`
`408`	`408`	`i_spclocation=PQfnumber(res,"spclocation");`
`409`	`409`
`410`	`410`	`ntups=PQntuples(res);`
`411`		`-dbinfos= (DbInfo)pg_malloc(sizeof(DbInfo)ntups);`
	`411`	`+dbinfos= (DbInfo)pg_malloc0(sizeof(DbInfo)ntups);`
`412`	`412`
`413`	`413`	`for (tupnum=0;tupnum<ntups;tupnum++)`
`414`	`414`	`{`
`@@ -636,15 +636,11 @@ get_old_cluster_logical_slot_infos(DbInfo *dbinfo, bool live_check)`
`636`	`636`	`PGconn*conn;`
`637`	`637`	`PGresult*res;`
`638`	`638`	`LogicalSlotInfo*slotinfos=NULL;`
`639`		`-intnum_slots=0;`
	`639`	`+intnum_slots;`
`640`	`640`
`641`	`641`	`/* Logical slots can be migrated since PG17. */`
`642`	`642`	`if (GET_MAJOR_VERSION(old_cluster.major_version) <=1600)`
`643`		`-{`
`644`		`-dbinfo->slot_arr.slots=slotinfos;`
`645`		`-dbinfo->slot_arr.nslots=num_slots;`
`646`	`643`	`return;`
`647`		`-}`
`648`	`644`
`649`	`645`	`conn=connectToServer(&old_cluster,dbinfo->db_name);`
`650`	`646`

Comments

(0)