NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4b65269

committed

Fix memory leaks from incorrect strsep() uses

Commit5d2e1cc introduced some strsep() uses, but it did thememory management wrong in some cases. We need to keep a separatepointer to the allocate memory so that we can free it later, becausestrsep() advances the pointer we pass to it, and it at the end itwill be NULL, so any free() calls won't do anything.(This fixes two of the four places changed in commit5d2e1cc. Theother two don't have this problem.)Reported-by: Alexander Lakhin <exclusion@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/79692bf9-17d3-41e6-b9c9-fc8c3944222a@eisentraut.org

1 parent24a36f9 commit4b65269Copy full SHA for 4b65269

File tree

2 files changed

-3

lines changed

src
- common
  - logging.c
- test/regress
  - pg_regress.c

2 files changed

-3

lines changed

`‎src/common/logging.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,9 @@ pg_logging_init(const char *argv0)`
`120`	`120`	`if (colors)`
`121`	`121`	`{`
`122`	`122`	`char*token;`
	`123`	`+char*cp=colors;`
`123`	`124`
`124`		`-while ((token=strsep(&colors,":")))`
	`125`	`+while ((token=strsep(&cp,":")))`
`125`	`126`	`{`
`126`	`127`	`char*e=strchr(token,'=');`
`127`	`128`

`‎src/test/regress/pg_regress.c`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,14 +233,17 @@ free_stringlist(_stringlist **listhead)`
`233`	`233`	`staticvoid`
`234`	`234`	`split_to_stringlist(constchars,constchardelim,_stringlist**listhead)`
`235`	`235`	`{`
`236`		`-char*sc=pg_strdup(s);`
`237`	`236`	`char*token;`
	`237`	`+char*sc;`
	`238`	`+char*tofree;`
	`239`	`+`
	`240`	`+tofree=sc=pg_strdup(s);`
`238`	`241`
`239`	`242`	`while ((token=strsep(&sc,delim)))`
`240`	`243`	`{`
`241`	`244`	`add_stringlist_item(listhead,token);`
`242`	`245`	`}`
`243`		`-free(sc);`
	`246`	`+free(tofree);`
`244`	`247`	`}`
`245`	`248`
`246`	`249`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4b65269

File tree

2 files changed

2 files changed

`‎src/common/logging.c`

`‎src/test/regress/pg_regress.c`

0 commit comments