diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index c7bcb04024..65f8308010 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -71,7 +71,7 @@ verify_password(char *user, char *password, Port *port,
 	p = pw_file_line;
 
 	test_user = strtok(p, ":");
-	test_pw = strtok(0, ":");
+	test_pw = strtok(NULL, ":");
 	if(!test_user || !test_pw ||
 	   test_user[0] == '\0' || test_pw[0] == '\0') {
 	    continue;