*** a/src/backend/libpq/hba.c
--- b/src/backend/libpq/hba.c
***************
*** 411,419 **** tokenize_file(const char *filename, FILE *file,
  								line_number, filename)));
  
  		/* Strip trailing linebreak from rawline */
! 		while (rawline[strlen(rawline) - 1] == '\n' ||
! 			   rawline[strlen(rawline) - 1] == '\r')
! 			rawline[strlen(rawline) - 1] = '\0';
  
  		lineptr = rawline;
  		while (strlen(lineptr) > 0)
--- 411,419 ----
  								line_number, filename)));
  
  		/* Strip trailing linebreak from rawline */
! 		lineptr = rawline + strlen(rawline) - 1;
! 		while (lineptr >= rawline && (*lineptr == '\n' || *lineptr == '\r'))
! 			*lineptr-- = '\0';
  
  		lineptr = rawline;
  		while (strlen(lineptr) > 0)