From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 21 Oct 2009 17:42:57 +0000 (+0100)
Subject: Perl_utf16_to_utf8() should return the correct length when being "understanding"
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cbc1fc82d0122a787bd36a9859ec1a21fe883045;p=p5sagit%2Fp5-mst-13.2.git

Perl_utf16_to_utf8() should return the correct length when being "understanding"

("be understanding" being a bodge added in 1de9afcdf18cf98b, which will soon go
when I fix the underlying cause of the bugs it works around.)
---

diff --git a/utf8.c b/utf8.c
index 6907b7e..dc12df8 100644
--- a/utf8.c
+++ b/utf8.c
@@ -961,7 +961,7 @@ Perl_utf16_to_utf8(pTHX_ U8* p, U8* d, I32 bytelen, I32 *newlen)
     if (bytelen == 1 && p[0] == 0) { /* Be understanding. */
 	 d[0] = 0;
 	 *newlen = 1;
-	 return d;
+	 return d + 1;
     }
 
     if (bytelen & 1)