diff --git a/misc/ChangeLog b/misc/ChangeLog
index 97975296..9c9d83dc 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22  Theodore Ts'o  <tytso@mit.edu>
+
+	* fsck.c (main): Check return from malloc of fsck_path string.
+
 2004-12-21  Theodore Ts'o  <tytso@mit.edu>
 
 	* tune2fs.c (parse_time): Fix minor buglet; the parse_time routine
diff --git a/misc/fsck.c b/misc/fsck.c
index da858677..b1e286a0 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -1221,6 +1221,10 @@ int main(int argc, char *argv[])
 	if (oldpath) {
 		fsck_path = malloc (strlen (fsck_prefix_path) + 1 +
 				    strlen (oldpath) + 1);
+		if (!fsck_path) {
+			fprintf(stderr, "%s: Unable to allocate memory for fsck_path\n", progname);
+			exit(EXIT_ERROR);
+		}
 		strcpy (fsck_path, fsck_prefix_path);
 		strcat (fsck_path, ":");
 		strcat (fsck_path, oldpath);