diff options
| author | phk <phk@FreeBSD.org> | 2004-12-12 12:02:34 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-12 12:02:34 +0000 |
| commit | 60aefa93100da1db3df39a23ee6569f9f62a1d4c (patch) | |
| tree | b10484b93e351c5119a13efe304d09b8b2b025af /sys/fs/ntfs/ntfs_vfsops.c | |
| parent | e37de0d950874075236809754c4ce642102b8fd2 (diff) | |
| download | FreeBSD-src-60aefa93100da1db3df39a23ee6569f9f62a1d4c.zip FreeBSD-src-60aefa93100da1db3df39a23ee6569f9f62a1d4c.tar.gz | |
Don't deref NULL if no charset-conversion is specified.
Return correct vnode in vop_bmap()
Diffstat (limited to 'sys/fs/ntfs/ntfs_vfsops.c')
| -rw-r--r-- | sys/fs/ntfs/ntfs_vfsops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index 767c171..52ba5cb 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -333,7 +333,10 @@ ntfs_mountfs(devvp, mp, td) /* Copy in the 8-bit to Unicode conversion table */ /* Initialize Unicode to 8-bit table from 8toU table */ ntfs_82u_init(ntmp, cs_local, cs_ntfs); - ntfs_u28_init(ntmp, NULL, cs_local, cs_ntfs); + if (cs_local != NULL && cs_ntfs != NULL) + ntfs_u28_init(ntmp, NULL, cs_local, cs_ntfs); + else + ntfs_u28_init(ntmp, ntmp->ntm_82u, cs_local, cs_ntfs); mp->mnt_data = (qaddr_t)ntmp; |
