Commit4569715

committed

Fix unlikely shared memory leak after failure in dshash_create().

Tidy-up for commit8c0d7ba, based on acomplaint from Andres Freund.Author: Thomas MunroReviewed-By: Andres FreundDiscussion:https://postgr.es/m/20170823054644.efuzftxjpfi6wwqs%40alap3.anarazel.de

1 parent20fbf25 commit4569715Copy full SHA for 4569715

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,10 +243,20 @@ dshash_create(dsa_area area, const dshash_parameters params, void *arg)`
`243`	`243`	`*/`
`244`	`244`	`hash_table->control->size_log2=DSHASH_NUM_PARTITIONS_LOG2;`
`245`	`245`	`hash_table->control->buckets=`
`246`		`-dsa_allocate(area,sizeof(dsa_pointer)*DSHASH_NUM_PARTITIONS);`
	`246`	`+dsa_allocate_extended(area,`
	`247`	`+sizeof(dsa_pointer)*DSHASH_NUM_PARTITIONS,`
	`248`	`+DSA_ALLOC_NO_OOM \|DSA_ALLOC_ZERO);`
	`249`	`+if (!DsaPointerIsValid(hash_table->control->buckets))`
	`250`	`+{`
	`251`	`+dsa_free(area,control);`
	`252`	`+ereport(ERROR,`
	`253`	`+(errcode(ERRCODE_OUT_OF_MEMORY),`
	`254`	`+errmsg("out of memory"),`
	`255`	`+errdetail("Failed on DSA request of size %zu.",`
	`256`	`+sizeof(dsa_pointer)*DSHASH_NUM_PARTITIONS)));`
	`257`	`+}`
`247`	`258`	`hash_table->buckets=dsa_get_address(area,`
`248`	`259`	`hash_table->control->buckets);`
`249`		`-memset(hash_table->buckets,0,sizeof(dsa_pointer)*DSHASH_NUM_PARTITIONS);`
`250`	`260`
`251`	`261`	`returnhash_table;`
`252`	`262`	`}`

Comments

(0)