diff options
| author | Jim Meyering <jim@meyering.net> | 2008-04-29 00:59:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 08:06:02 -0700 |
| commit | cd6fda36089cf3b450821228c2f575a3b5d0e7a7 (patch) | |
| tree | 5dee060a4d4fead58251611b28377833b504489d /fs | |
| parent | 3fbe5c31009d26c7b6b73d5c69fe930a5e9d2e26 (diff) | |
| download | linux-cd6fda36089cf3b450821228c2f575a3b5d0e7a7.tar.gz linux-cd6fda36089cf3b450821228c2f575a3b5d0e7a7.tar.bz2 linux-cd6fda36089cf3b450821228c2f575a3b5d0e7a7.zip | |
hfsplus: handle match_strdup failure
fs/hfsplus/options.c (hfsplus_parse_options): Handle match_strdup failure.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/hfsplus/options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c index dc64fac00831..9997cbf8beb5 100644 --- a/fs/hfsplus/options.c +++ b/fs/hfsplus/options.c @@ -132,7 +132,8 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi) return 0; } p = match_strdup(&args[0]); - sbi->nls = load_nls(p); + if (p) + sbi->nls = load_nls(p); if (!sbi->nls) { printk(KERN_ERR "hfs: unable to load nls mapping \"%s\"\n", p); kfree(p); |