Commitf94eec4

committed

When passing query strings to workers, pass the terminating \0.

Otherwise, when the query string is read, we might trailing garbagebeyond the end, unless there happens to be a \0 there by good luck.Report and patch by Thomas Munro. Reviewed by Rafia Sabih.Discussion:http://postgr.es/m/CAEepm=2SJs7X+_vx8QoDu8d1SMEOxtLhxxLNzZun_BvNkuNhrw@mail.gmail.com

1 parent7d3583a commitf94eec4Copy full SHA for f94eec4

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ ExecInitParallelPlan(PlanState planstate, EState estate,`
`597`	`597`
`598`	`598`	`/* Estimate space for query text. */`
`599`	`599`	`query_len=strlen(estate->es_sourceText);`
`600`		`-shm_toc_estimate_chunk(&pcxt->estimator,query_len);`
	`600`	`+shm_toc_estimate_chunk(&pcxt->estimator,query_len+1);`
`601`	`601`	`shm_toc_estimate_keys(&pcxt->estimator,1);`
`602`	`602`
`603`	`603`	`/* Estimate space for serialized PlannedStmt. */`
`@@ -672,8 +672,8 @@ ExecInitParallelPlan(PlanState planstate, EState estate,`
`672`	`672`	`shm_toc_insert(pcxt->toc,PARALLEL_KEY_EXECUTOR_FIXED,fpes);`
`673`	`673`
`674`	`674`	`/* Store query string */`
`675`		`-query_string=shm_toc_allocate(pcxt->toc,query_len);`
`676`		`-memcpy(query_string,estate->es_sourceText,query_len);`
	`675`	`+query_string=shm_toc_allocate(pcxt->toc,query_len+1);`
	`676`	`+memcpy(query_string,estate->es_sourceText,query_len+1);`
`677`	`677`	`shm_toc_insert(pcxt->toc,PARALLEL_KEY_QUERY_TEXT,query_string);`
`678`	`678`
`679`	`679`	`/* Store serialized PlannedStmt. */`

Comments

(0)