NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8824bae

committed

Fix some bogus direct uses of realloc().

pg_dump/parallel.c was using realloc() directly with no error check.While the odds of an actual failure here seem pretty low, Coveritycomplains about it, so fix by using pg_realloc() instead.While looking for other instances, I noticed a couple of places inpsql that hadn't gotten the memo about the availability of pg_realloc.These aren't bugs, since they did have error checks, but verboselyinconsistent code is not a good thing.Back-patch as far as 9.3. 9.2 did not have pg_dump/parallel.c, nordid it have pg_realloc available in all frontend code.

1 parentab45d90 commit8824baeCopy full SHA for 8824bae

File tree

3 files changed

-15

lines changed

src/bin
- pg_dump
  - parallel.c
- psql
  - command.c
  - tab-complete.c

3 files changed

-15

lines changed

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1300,15 +1300,15 @@ readMessageFromPipe(int fd)`
`1300`	`1300`	`{`
`1301`	`1301`	`/* could be any number */`
`1302`	`1302`	`bufsize+=16;`
`1303`		`-msg= (char*)realloc(msg,bufsize);`
	`1303`	`+msg= (char*)pg_realloc(msg,bufsize);`
`1304`	`1304`	`}`
`1305`	`1305`	`}`
`1306`	`1306`
`1307`	`1307`	`/*`
`1308`	`1308`	`* Worker has closed the connection, make sure to clean up before return`
`1309`	`1309`	`* since we are not returning msg (but did allocate it).`
`1310`	`1310`	`*/`
`1311`		`-free(msg);`
	`1311`	`+pg_free(msg);`
`1312`	`1312`
`1313`	`1313`	`returnNULL;`
`1314`	`1314`	`}`

`‎src/bin/psql/command.c`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1112,12 +1112,7 @@ exec_command(const char *cmd,`
`1112`	`1112`	`while ((opt=psql_scan_slash_option(scan_state,`
`1113`	`1113`	`OT_NORMAL,NULL, false)))`
`1114`	`1114`	`{`
`1115`		`-newval=realloc(newval,strlen(newval)+strlen(opt)+1);`
`1116`		`-if (!newval)`
`1117`		`-{`
`1118`		`-psql_error("out of memory\n");`
`1119`		`-exit(EXIT_FAILURE);`
`1120`		`-}`
	`1115`	`+newval=pg_realloc(newval,strlen(newval)+strlen(opt)+1);`
`1121`	`1116`	`strcat(newval,opt);`
`1122`	`1117`	`free(opt);`
`1123`	`1118`	`}`

`‎src/bin/psql/tab-complete.c`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3820,13 +3820,8 @@ complete_from_variables(char text, const char prefix, const char *suffix)`
`3820`	`3820`	`if (nvars >=maxvars)`
`3821`	`3821`	`{`
`3822`	`3822`	`maxvars *=2;`
`3823`		`-varnames= (char**)realloc(varnames,`
`3824`		`- (maxvars+1)sizeof(char));`
`3825`		`-if (!varnames)`
`3826`		`-{`
`3827`		`-psql_error("out of memory\n");`
`3828`		`-exit(EXIT_FAILURE);`
`3829`		`-}`
	`3823`	`+varnames= (char**)pg_realloc(varnames,`
	`3824`	`+(maxvars+1)sizeof(char));`
`3830`	`3825`	`}`
`3831`	`3826`
`3832`	`3827`	`buffer= (char*)pg_malloc(strlen(ptr->name)+overhead);`

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!

Commit8824bae

File tree

3 files changed

3 files changed

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

`‎src/bin/psql/command.c`

`‎src/bin/psql/tab-complete.c`

0 commit comments