diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
| commit | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (patch) | |
| tree | fe6fa1c0b92c43804a31b443ce4b5159d4d0ce13 /fs/hfs/trans.c | |
| parent | f87114e982cf3b657411e2df50e4e42ec1f162dd (diff) | |
| parent | be09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (diff) | |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'fs/hfs/trans.c')
| -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) { |