Commit412893b

committed

Fix uninitialized memory bug

Add support for PGHOST, PGPORT, PGUSER environment variables

1 parentcdfb3d9 commit412893bCopy full SHA for 412893b

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,10 @@ Basically it is same as BSD license. See pgbench.c for more details.`
`164`	`164`
`165`	`165`	`o History`
`166`	`166`
	`167`	`+2003/06/10`
	`168`	`+* fix uninitialized memory bug`
	`169`	`+* add support for PGHOST, PGPORT, PGUSER environment variables`
	`170`	`+`
`167`	`171`	`2002/07/20`
`168`	`172`	`* patch contributed by Neil Conway.`
`169`	`173`	`* code/document clean up and add -l option.`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,10 @@ pgbench $B$O@P0f(B $BC#IW$K$h$C$F=q$+$l$^$7$?!%%i%$%;%s%9>r7o$O(B pgbench.c`
`184`	`184`
`185`	`185`	`$B"#2~DjMzNr(B`
`186`	`186`
	`187`	`+2003/06/10`
	`188`	`+* $B%a%b%j$,=i4\|2=$5$l$F$$$J$$%P%0$r=$@5(B`
	`189`	`+* $B4D6-JQ?t(BPGHOST, PGPORT, PGUSER$B$rG'<1$9$k$h$&$K$7$?!%(B`
	`190`	`+`
`187`	`191`	`2002/07/20`
`188`	`192`	`* Nei Conway$B$5$s$N%Q%C%A$rE,MQ!%(B`
`189`	`193`	`* -l $B%*%W%7%g%s$NDI2C!%(B`

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.23 2003/05/14 03:25:56 tgl Exp $`
	`2`	`+ * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.24 2003/06/10 09:07:15 ishii Exp $`
`3`	`3`	`*`
`4`	`4`	`* pgbench: a simple TPC-B like benchmark program for PostgreSQL`
`5`	`5`	`* written by Tatsuo Ishii`
`@@ -694,6 +694,14 @@ main(int argc, char **argv)`
`694`	`694`
`695`	`695`	`PGconn*con;`
`696`	`696`	`PGresult*res;`
	`697`	`+char*env;`
	`698`	`+`
	`699`	`+if ((env=getenv("PGHOST"))!=NULL&&*env!='\0')`
	`700`	`+pghost=env;`
	`701`	`+if ((env=getenv("PGPORT"))!=NULL&&*env!='\0')`
	`702`	`+pgport=env;`
	`703`	`+elseif ((env=getenv("PGUSER"))!=NULL&&*env!='\0')`
	`704`	`+login=env;`
`697`	`705`
`698`	`706`	`while ((c=getopt(argc,argv,"ih:nvp:dc:t:s:U:P:CNSl"))!=-1)`
`699`	`707`	`{`
`@@ -788,8 +796,11 @@ main(int argc, char **argv)`
`788`	`796`	`dbName=argv[optind];`
`789`	`797`	`else`
`790`	`798`	`{`
`791`		`-dbName=getenv("USER");`
`792`		`-if (dbName==NULL)`
	`799`	`+if ((env=getenv("PGDATABASE"))!=NULL&&*env!='\0')`
	`800`	`+dbName=env;`
	`801`	`+elseif (login!=NULL&&*login!='\0')`
	`802`	`+dbName=login;`
	`803`	`+else`
`793`	`804`	`dbName="";`
`794`	`805`	`}`
`795`	`806`
`@@ -802,7 +813,7 @@ main(int argc, char **argv)`
`802`	`813`	`remains=nclients;`
`803`	`814`
`804`	`815`	`state= (CState)malloc(sizeof(state)*nclients);`
`805`		`-memset(state,0,sizeof(*state));`
	`816`	`+memset(state,0,sizeof(state)nclients);`
`806`	`817`
`807`	`818`	`if (use_log)`
`808`	`819`	`{`

Comments

(0)