Commit0954358

committed

Fix a couple of places where the result of fgets() wasn't checked.

This is mostly to suppress compiler warnings, although in principlethe cases could result in undesirable behavior.Martin Pitt

1 parent21992dd commit0954358Copy full SHA for 0954358

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.53 2010/01/02 16:57:59 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.54 2010/04/30 17:09:13 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -252,7 +252,8 @@ get_prompt(promptStatus_t status)`
`252`	`252`	`fd=popen(file,"r");`
`253`	`253`	`if (fd)`
`254`	`254`	`{`
`255`		`-fgets(buf,sizeof(buf),fd);`
	`255`	`+if (fgets(buf,sizeof(buf),fd)==NULL)`
	`256`	`+buf[0]='\0';`
`256`	`257`	`pclose(fd);`
`257`	`258`	`}`
`258`	`259`	`if (strlen(buf)>0&&buf[strlen(buf)-1]=='\n')`

Lines changed: 3 additions & 2 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/interfaces/libpq/fe-connect.c,v 1.391 2010/03/17 20:58:38 petere Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.392 2010/04/30 17:09:13 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -4400,7 +4400,8 @@ PasswordFromFile(char hostname, char port, char dbname, char username)`
`4400`	`4400`	`*ret;`
`4401`	`4401`	`intlen;`
`4402`	`4402`
`4403`		`-fgets(buf,sizeof(buf),fp);`
	`4403`	`+if (fgets(buf,sizeof(buf),fp)==NULL)`
	`4404`	`+break;`
`4404`	`4405`
`4405`	`4406`	`len=strlen(buf);`
`4406`	`4407`	`if (len==0)`

Comments

(0)