--- src/auths/plaintext.c.orig	Tue Apr  1 14:53:33 2003

+++ src/auths/plaintext.c	Tue Apr  1 14:53:40 2003

@@ -93,7 +93,7 @@

   if (Ustrcmp(data, "=") == 0)

     {

     expand_nstring[++expand_nmax] = US"";

-    expand_nstring[expand_nmax] = 0;

+    expand_nlength[expand_nmax] = 0;

     }

   else

     {

--- src/rewrite.c.orig	Tue Mar 11 13:20:22 2003

+++ src/rewrite.c	Tue Apr 15 14:48:37 2003

@@ -261,7 +261,7 @@

         while (*p2 == ' ') p2++;

         pf2 = parse_fix_phrase(p2, Ustrlen(p2), buff2, sizeof(buff2));

-        start = Ustrlen(buff1) + start + new - p1;

+        start = Ustrlen(pf1) + start + new - p1;

         end = start + Ustrlen(newparsed);

         new = string_sprintf("%s%.*s%s", pf1, p2 - p1, p1, pf2);

         }

--- src/transports/appendfile.c.orig	Tue Mar 11 13:20:23 2003

+++ src/transports/appendfile.c	Tue Apr 15 14:46:18 2003

@@ -702,7 +702,9 @@

     if (pcre_exec(regex, NULL, CS name, Ustrlen(name), 0, 0, ovector,6) >= 2)

       {

       int size;

-      Ustrncpy(buffer, name + ovector[2], ovector[3] - ovector[2]);

+      int n = ovector[3] - ovector[2];

+      Ustrncpy(buffer, name + ovector[2], n);

+      buffer[n] = 0;

       size = Uatoi(buffer);

       sum += size;

       DEBUG(D_transport)