Be a little more careful with strtok().

tglsfdc · tglsfdc · commit a568b2273c42 · 2000-11-27T03:46:01.000Z
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
@@ -2,7 +2,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.33 2000/11/27 03:43:49 tgl Exp $
+ * $Id: password.c,v 1.34 2000/11/27 03:46:01 tgl Exp $
  *
  */
 
@@ -66,9 +66,9 @@ verify_password(const Port *port, const char *user, const char *password)
 		p = pw_file_line;
 
 		test_user = strtok(p, ":");
-		test_pw = strtok(NULL, ":");
 		if (!test_user || test_user[0] == '\0')
 			continue;
+		test_pw = strtok(NULL, ":");
 
 		if (strcmp(user, test_user) == 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`3`	`3`	`* Portions Copyright (c) 1994, Regents of the University of California`
`4`	`4`	`*`
`5`		`- * $Id: password.c,v 1.33 2000/11/27 03:43:49 tgl Exp $`
	`5`	`+ * $Id: password.c,v 1.34 2000/11/27 03:46:01 tgl Exp $`
`6`	`6`	`*`
`7`	`7`	`*/`
`8`	`8`
`@@ -66,9 +66,9 @@ verify_password(const Port port, const char user, const char *password)`
`66`	`66`	`p = pw_file_line;`
`67`	`67`
`68`	`68`	`test_user = strtok(p, ":");`
`69`		`- test_pw = strtok(NULL, ":");`
`70`	`69`	`if (!test_user \|\| test_user[0] == '\0')`
`71`	`70`	`continue;`
	`71`	`+ test_pw = strtok(NULL, ":");`
`72`	`72`
`73`	`73`	`if (strcmp(user, test_user) == 0)`
`74`	`74`	`{`