Merge tag 'memblock-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...

[linux-block.git] / fs / hfs / trans.c

diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c
index 39f5e343bf4d487a74787e3a68c137c626bc24a1..fdb0edb8a607d6c3c0ea8bb704afacbb2aa35bd0 100644 (file)
--- a/fs/hfs/trans.c
+++ b/fs/hfs/trans.c
@@ -109,7 +109,7 @@ void hfs_asc2mac(struct super_block *sb, struct hfs_name *out, const struct qstr
        if (nls_io) {
                wchar_t ch;
 
-               while (srclen > 0) {
+               while (srclen > 0 && dstlen > 0) {
                        size = nls_io->char2uni(src, srclen, &ch);
                        if (size < 0) {
                                ch = '?';