diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index 1dd3722142c9e83c1ec228099c3a3fd302a2179b..c886a67df43792a1692eec6b3b90238413e9f844 100644
*** a/contrib/pg_upgrade/file.c
--- b/contrib/pg_upgrade/file.c
*************** load_directory(const char *dirname, stru
*** 259,265 ****
  			return -1;
  		}
  
! 		entrysize = sizeof(struct dirent) - sizeof(direntry->d_name) +
  			strlen(direntry->d_name) + 1;
  
  		(*namelist)[name_num] = (struct dirent *) malloc(entrysize);
--- 259,265 ----
  			return -1;
  		}
  
! 		entrysize = offsetof(struct dirent, d_name) +
  			strlen(direntry->d_name) + 1;
  
  		(*namelist)[name_num] = (struct dirent *) malloc(entrysize);
