Commit7be0d77

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 parent72567f6 commit7be0d77Copy full SHA for 7be0d77

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ ExecInitParallelPlan(PlanState planstate, EState estate, int nworkers)`
`410`	`410`
`411`	`411`	`/* Estimate space for query text. */`
`412`	`412`	`query_len=strlen(estate->es_sourceText);`
`413`		`-shm_toc_estimate_chunk(&pcxt->estimator,query_len);`
	`413`	`+shm_toc_estimate_chunk(&pcxt->estimator,query_len+1);`
`414`	`414`	`shm_toc_estimate_keys(&pcxt->estimator,1);`
`415`	`415`
`416`	`416`	`/* Estimate space for serialized PlannedStmt. */`
`@@ -478,8 +478,8 @@ ExecInitParallelPlan(PlanState planstate, EState estate, int nworkers)`
`478`	`478`	`*/`
`479`	`479`
`480`	`480`	`/* Store query string */`
`481`		`-query_string=shm_toc_allocate(pcxt->toc,query_len);`
`482`		`-memcpy(query_string,estate->es_sourceText,query_len);`
	`481`	`+query_string=shm_toc_allocate(pcxt->toc,query_len+1);`
	`482`	`+memcpy(query_string,estate->es_sourceText,query_len+1);`
`483`	`483`	`shm_toc_insert(pcxt->toc,PARALLEL_KEY_QUERY_TEXT,query_string);`
`484`	`484`
`485`	`485`	`/* Store serialized PlannedStmt. */`

Comments

(0)