Commit67cda1e

authored and

committed

Avoid memory leak in rmtree() when path cannot be opened

An allocation done for the directory names to recurse into for theirdeletion was done before OPENDIR(), so, assuming that a failure happens,this could leak a bit of memory.Author: Ranier VilelaReviewed-by: Daniel GustafssonDiscussion:https://postgr.es/m/CAEudQAoN3-2ZKBALThnEk_q2hu8En5A0WG9O+5siJTQKVZzoWQ@mail.gmail.com

1 parentf22e039 commit67cda1eCopy full SHA for 67cda1e

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ rmtree(const char *path, bool rmtopdir)`
`55`	`55`	`boolresult= true;`
`56`	`56`	`size_tdirnames_size=0;`
`57`	`57`	`size_tdirnames_capacity=8;`
`58`		`-char*dirnames=palloc(sizeof(char)*dirnames_capacity);`
	`58`	`+char**dirnames;`
`59`	`59`
`60`	`60`	`dir=OPENDIR(path);`
`61`	`61`	`if (dir==NULL)`
`@@ -64,6 +64,8 @@ rmtree(const char *path, bool rmtopdir)`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+dirnames= (char*)palloc(sizeof(char)*dirnames_capacity);`
	`68`	`+`
`67`	`69`	`while (errno=0, (de=readdir(dir)))`
`68`	`70`	`{`
`69`	`71`	`if (strcmp(de->d_name,".")==0\|\|`

Comments

(0)