From: didg <didg>
Date: Sat, 9 Sep 2006 19:05:57 +0000 (+0000)
Subject: unicode patch from TSUBAKIMOTO Hiroya
X-Git-Tag: before_sfm~10
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4acc09afabe37f09187c7c093dfb244687b3ed1d;hp=4d892a8a3d98ab37c7910753e3f436dc84a19f77;p=netatalk.git

unicode patch from TSUBAKIMOTO Hiroya
---

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 2e41a4c1..b79d776a 100644
--- 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);