# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1418517311 21600
# Node ID 50dc30893f9d70805d7800513b1c0a27a8984d9a
# Parent  74e2642c35e87483f7384f8beb814660424b55a6
Fix bug in sed y/// where bytes in target but not in source were replaced by zeroes (nul terminator overwritten).

diff -r 74e2642c35e8 -r 50dc30893f9d toys/pending/sed.c
--- a/toys/pending/sed.c	Sat Dec 13 12:27:51 2014 -0600
+++ b/toys/pending/sed.c	Sat Dec 13 18:35:11 2014 -0600
@@ -254,7 +254,7 @@
   memcpy(s+oldlen, new, newlen);
   s[oldlen+newlen] = 0;
 
-  return s+oldlen+newlen;
+  return s+oldlen+newlen+1;
 }
 
 // An empty regex repeats the previous one
@@ -504,13 +504,11 @@
         // place because backrefs may refer to text after it's overwritten.)
         len += newlen-mlen;
         swap = xmalloc(len+1);
-        rswap = swap+(rline-line);
+        rswap = swap+(rline-line)+match[0].rm_so;
         memcpy(swap, line, (rline-line)+match[0].rm_so);
-        memcpy(rswap+match[0].rm_so+newlen, rline+match[0].rm_eo,
-               (rlen -= match[0].rm_eo)+1);
+        memcpy(rswap+newlen, rline+match[0].rm_eo, (rlen -= match[0].rm_eo)+1);
 
         // copy in new replacement text
-        rswap += match[0].rm_so;
         for (off = mlen = 0; new[off]; off++) {
           int cc = 0, ll;