diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /fs/hfs | |
| parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
| parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/trans.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c index e673a88b8ae7..b1ce4c7ad3fb 100644 --- a/fs/hfs/trans.c +++ b/fs/hfs/trans.c | |||
| @@ -40,6 +40,8 @@ int hfs_mac2asc(struct super_block *sb, char *out, const struct hfs_name *in) | |||
| 40 | 40 | ||
| 41 | src = in->name; | 41 | src = in->name; |
| 42 | srclen = in->len; | 42 | srclen = in->len; |
| 43 | if (srclen > HFS_NAMELEN) | ||
| 44 | srclen = HFS_NAMELEN; | ||
| 43 | dst = out; | 45 | dst = out; |
| 44 | dstlen = HFS_MAX_NAMELEN; | 46 | dstlen = HFS_MAX_NAMELEN; |
| 45 | if (nls_io) { | 47 | if (nls_io) { |