unicode patch from TSUBAKIMOTO Hiroya

[netatalk.git] / libatalk / unicode / charcnv.c

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 2e41a4c16667e06dca539202300ae4958803cf8c..b79d776ac1afa4ca4ad0197f2863e2d86ce6a345 100644 (file)
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -973,7 +973,10 @@ static size_t push_charset_flags (charset_t to_set, charset_t cap_set, char* src
            } else if (errno != E2BIG) {
              SAFE_FREE(buf);
              goto end;
-           }
+            } else if (o < buflen) {
+              buflen -= o;
+              break;
+            }
          }
          if (o_len < buflen * 3) {
            SAFE_FREE(buf);