Commitb58d8c9

committed

Don't putenv() a string that is allocated in a context that will go away

soon. I suspect this explains bug #3902, though I'm still not able toreproduce that.

1 parent65b39ec commitb58d8c9Copy full SHA for b58d8c9

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.162 2008/01/01 19:45:49 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.163 2008/01/30 04:11:19 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -384,7 +384,6 @@ pg_GSS_recvauth(Port *port)`
`384`	`384`	`min_stat,`
`385`	`385`	`lmin_s,`
`386`	`386`	`gflags;`
`387`		`-char*kt_path;`
`388`	`387`	`intmtype;`
`389`	`388`	`intret;`
`390`	`389`	`StringInfoDatabuf;`
`@@ -398,11 +397,19 @@ pg_GSS_recvauth(Port *port)`
`398`	`397`	`* setenv("KRB5_KTNAME", pg_krb_server_keyfile, 0); except setenv()`
`399`	`398`	`* not always available.`
`400`	`399`	`*/`
`401`		`-if (!getenv("KRB5_KTNAME"))`
	`400`	`+if (getenv("KRB5_KTNAME")==NULL)`
`402`	`401`	`{`
`403`		`-kt_path=palloc(MAXPGPATH+13);`
`404`		`-snprintf(kt_path,MAXPGPATH+13,`
`405`		`-"KRB5_KTNAME=%s",pg_krb_server_keyfile);`
	`402`	`+size_tkt_len=strlen(pg_krb_server_keyfile)+14;`
	`403`	`+char*kt_path=malloc(kt_len);`
	`404`	`+`
	`405`	`+if (!kt_path)`
	`406`	`+{`
	`407`	`+ereport(LOG,`
	`408`	`+(errcode(ERRCODE_OUT_OF_MEMORY),`
	`409`	`+errmsg("out of memory")));`
	`410`	`+returnSTATUS_ERROR;`
	`411`	`+}`
	`412`	`+snprintf(kt_path,kt_len,"KRB5_KTNAME=%s",pg_krb_server_keyfile);`
`406`	`413`	`putenv(kt_path);`
`407`	`414`	`}`
`408`	`415`	`}`

Comments

(0)