Ressurect change 27824, which plugs a resource leak in uncalled code.

[p5sagit/p5-mst-13.2.git] / pp_sys.c

diff --git a/pp_sys.c b/pp_sys.c
index fdc9937..2df5a77 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -1867,7 +1867,7 @@ PP(pp_send)
                    /* Don't call sv_len_utf8 again because it will call magic
                       or overloading a second time, and we might get back a
                       different result.  */
-                   blen_chars = utf8_length(buffer, buffer + blen);
+                   blen_chars = utf8_length((U8*)buffer, (U8*)buffer + blen);
                } else {
                    /* It's safe, and it may well be cached.  */
                    blen_chars = sv_len_utf8(bufsv);
@@ -1885,18 +1885,24 @@ PP(pp_send)
 #else
            length = (Size_t)SvIVx(*++MARK);
 #endif
-           if ((SSize_t)length < 0)
+           if ((SSize_t)length < 0) {
+               Safefree(tmpbuf);
                DIE(aTHX_ "Negative length");
+           }
        }
 
        if (MARK < SP) {
            offset = SvIVx(*++MARK);
            if (offset < 0) {
-               if (-offset > (IV)blen_chars)
+               if (-offset > (IV)blen_chars) {
+                   Safefree(tmpbuf);
                    DIE(aTHX_ "Offset outside string");
+               }
                offset += blen_chars;
-           } else if (offset >= (IV)blen_chars && blen_chars > 0)
+           } else if (offset >= (IV)blen_chars && blen_chars > 0) {
+               Safefree(tmpbuf);
                DIE(aTHX_ "Offset outside string");
+           }
        } else
            offset = 0;
        if (length > blen_chars - offset)
@@ -1959,14 +1965,15 @@ PP(pp_send)
     else
        DIE(aTHX_ PL_no_sock_func, "send");
 #endif
-    if (tmpbuf)
-       Safefree(tmpbuf);
 
     if (retval < 0)
        goto say_undef;
     SP = ORIGMARK;
     if (doing_utf8)
         retval = utf8_length((U8*)buffer, (U8*)buffer + retval);
+
+    if (tmpbuf)
+       Safefree(tmpbuf);
 #if Size_t_size > IVSIZE
     PUSHn(retval);
 #else
@@ -1975,6 +1982,8 @@ PP(pp_send)
     RETURN;
 
   say_undef:
+    if (tmpbuf)
+       Safefree(tmpbuf);
     SP = ORIGMARK;
     RETPUSHUNDEF;
 }