Module Name: src
Committed By: christos
Date: Fri Apr 28 11:33:00 UTC 2017
Modified Files:
src/sbin/fsck_msdos: dir.c
Log Message:
Prevent SEGV on corrupted msdos directories (Veo Zhang)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sbin/fsck_msdos/dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_msdos/dir.c
diff -u src/sbin/fsck_msdos/dir.c:1.28 src/sbin/fsck_msdos/dir.c:1.29
--- src/sbin/fsck_msdos/dir.c:1.28 Mon Mar 7 09:47:25 2016
+++ src/sbin/fsck_msdos/dir.c Fri Apr 28 07:33:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.28 2016/03/07 14:47:25 christos Exp $ */
+/* $NetBSD: dir.c,v 1.29 2017/04/28 11:33:00 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: dir.c,v 1.28 2016/03/07 14:47:25 christos Exp $");
+__RCSID("$NetBSD: dir.c,v 1.29 2017/04/28 11:33:00 christos Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -623,7 +623,7 @@ readDosDirSection(int f, struct bootbloc
dirent.name[8] = '\0';
for (k = 7; k >= 0 && dirent.name[k] == ' '; k--)
dirent.name[k] = '\0';
- if (dirent.name[k] != '\0')
+ if (k < 0 || dirent.name[k] != '\0')
k++;
if (dirent.name[0] == SLOT_E5)
dirent.name[0] = 0xe5;
