NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1a29217

committed

Free temporary memory when reading TOC

ReadStr returns allocated memory which the caller is responsible forfreeing when done with the string. This commit ensures that memory isfreed in one case which used ReadStr in a conditional. While the leakmight not be too concerning, this makes the code consistent across allReadStr callsites in ReadToc. Due to the lack of complaints of issuesin production from this, no backpatch is performed at this point.Author: Bharath Rupireddy, Georgios KokolatosReviewed-by: Kyotaro HoriguchiDiscussion:https://postgr.es/m/oZwKiUxFsVaetG2xOJp7Hwao8F1AKIdfFDQLNJrnwoaxmjyB-45r_aYmhgXHKLcMI3GT24m9L6HafSi2ns7WFxXe0mw2_tIJpD-Z3vb_eyI=@pm.me

1 parentcf29a11 commit1a29217Copy full SHA for 1a29217

File tree

1 file changed

+15

-1

lines changed

src/bin/pg_dump
- pg_backup_archiver.c

1 file changed

+15

-1

lines changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2494,6 +2494,7 @@ ReadToc(ArchiveHandle *AH)`
`2494`	`2494`	`intdepIdx;`
`2495`	`2495`	`intdepSize;`
`2496`	`2496`	`TocEntry*te;`
	`2497`	`+boolis_supported;`
`2497`	`2498`
`2498`	`2499`	`AH->tocCount=ReadInt(AH);`
`2499`	`2500`	`AH->maxDumpId=0;`
`@@ -2574,7 +2575,20 @@ ReadToc(ArchiveHandle *AH)`
`2574`	`2575`	`te->tableam=ReadStr(AH);`
`2575`	`2576`
`2576`	`2577`	`te->owner=ReadStr(AH);`
`2577`		`-if (AH->version<K_VERS_1_9\|\|strcmp(ReadStr(AH),"true")==0)`
	`2578`	`+is_supported= true;`
	`2579`	`+if (AH->version<K_VERS_1_9)`
	`2580`	`+is_supported= false;`
	`2581`	`+else`
	`2582`	`+{`
	`2583`	`+tmp=ReadStr(AH);`
	`2584`	`+`
	`2585`	`+if (strcmp(tmp,"true")==0)`
	`2586`	`+is_supported= false;`
	`2587`	`+`
	`2588`	`+free(tmp);`
	`2589`	`+}`
	`2590`	`+`
	`2591`	`+if (!is_supported)`
`2578`	`2592`	`pg_log_warning("restoring tables WITH OIDS is not supported anymore");`
`2579`	`2593`
`2580`	`2594`	`/* Read TOC entry dependencies */`

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!

Commit1a29217

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

0 commit comments