From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sat, 29 Jul 2000 00:55:39 +0000 (+0000)
Subject: Tune the comments and hopefully stop a memory leak.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=350e0994728e1b6ea784b5d0c0537105d8b22af7;p=p5sagit%2Fp5-mst-13.2.git

Tune the comments and hopefully stop a memory leak.

p4raw-id: //depot/perl@6463
---

diff --git a/toke.c b/toke.c
index f368367..130d5c4 100644
--- a/toke.c
+++ b/toke.c
@@ -2521,7 +2521,7 @@ Perl_yylex(pTHX)
 	    if (bof)
 	    {
 		PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr);
-		/* Shouldn't this wsallow_bom() be earlier, e.g.
+		/* Shouldn't this swallow_bom() be earlier, e.g.
 		 * immediately after where bof is set?  Currently you can't
 		 * have e.g. a UTF16 sharpbang line. --Mike Guy */
 		s = swallow_bom((U8*)s);
@@ -7390,6 +7390,7 @@ STATIC char*
 S_swallow_bom(pTHX_ U8 *s)
 {
     STRLEN slen;
+    U8 *olds = s;
     slen = SvCUR(PL_linestr);
     switch (*s) {
     case 0xFF:       
@@ -7404,8 +7405,10 @@ S_swallow_bom(pTHX_ U8 *s)
 	    s += 2;
 	    filter_add(utf16rev_textfilter, NULL);
 	    New(898, news, (PL_bufend - (char*)s) * 3 / 2 + 1, U8);
+	    /* See the notes on utf16_to_utf8() in utf8.c --Mike Guy */
 	    PL_bufend = (char*)utf16_to_utf8((U16*)s, news,
 					     PL_bufend - (char*)s);
+	    Safefree(olds);
 	    s = news;
 #else
 	    Perl_croak(aTHX_ "Unsupported script encoding");
@@ -7418,8 +7421,10 @@ S_swallow_bom(pTHX_ U8 *s)
 	    U8 *news;
 	    filter_add(utf16_textfilter, NULL);
 	    New(898, news, (PL_bufend - (char*)s) * 3 / 2 + 1, U8);
+	    /* See the notes on utf16_to_utf8() in utf8.c --Mike Guy */
 	    PL_bufend = (char*)utf16_to_utf8((U16*)s, news,
 					     PL_bufend - (char*)s);
+	    Safefree(olds);
 	    s = news;
 #else
 	    Perl_croak(aTHX_ "Unsupported script encoding");
diff --git a/utf8.c b/utf8.c
index 95f457f..d00b9f3 100644
--- a/utf8.c
+++ b/utf8.c
@@ -333,6 +333,7 @@ Perl_bytes_to_utf8(pTHX_ U8* s, STRLEN *len)
  *     a hard error (and it should be listed in perldiag).
  * (4) The tests (in comp/t/require.t) are a joke: the UTF16 BOM
  *     really ought to be followed by valid UTF16 characters.
+ * See swallow_bom() in toke.c.
  * --Mike Guy */
 U8*
 Perl_utf16_to_utf8(pTHX_ U16* p, U8* d, I32 bytelen)