#21866 was wrong. another try to plumb that damn leak.

p4raw-id: //depot/perl@21876

2 files changed, 2 insertions, 3 deletions

diff --git a/mg.c b/mg.c
index 7955e52003..4ef7910bd6 100644
--- a/mg.c
+++ b/mg.c
@@ -384,7 +384,7 @@ Perl_mg_free(pTHX_ SV *sv)
 	if (vtbl && vtbl->svt_free)
 	    CALL_FPTR(vtbl->svt_free)(aTHX_ sv, mg);
 	if (mg->mg_ptr && mg->mg_type != PERL_MAGIC_regex_global) {
-	    if (mg->mg_len > 0)
+	    if (mg->mg_len > 0 || mg->mg_type == PERL_MAGIC_utf8)
 		Safefree(mg->mg_ptr);
 	    else if (mg->mg_len == HEf_SVKEY)
 		SvREFCNT_dec((SV*)mg->mg_ptr);
diff --git a/sv.c b/sv.c
index 40d99cbdbb..47616ce5f7 100644
--- a/sv.c
+++ b/sv.c
@@ -6060,8 +6060,7 @@ Perl_sv_pos_b2u(pTHX_ register SV* sv, I32* offsetp)
 	    assert(mg);
 
 	    if (!mg->mg_ptr) {
-		mg->mg_len = PERL_MAGIC_UTF8_CACHESIZE * 2;
-		Newz(0, cache, mg->mg_len, STRLEN);
+		Newz(0, cache, PERL_MAGIC_UTF8_CACHESIZE * 2, STRLEN);
 		mg->mg_ptr = (char *) cache;
 	    }
 	    assert(cache);