Merge lp:~tjvries/ubuntu/natty/mawk/fix-for-955791 into lp:ubuntu/natty/mawk

[Tom de Vries]

to reproduce/test:
1. download CAT and guts.awk from https://bugs.launchpad.net/ubuntu/+source/mawk/+bug/955791
2. run 'cat CAT | valgrind mawk -f guts.awk'
   run it in an empty directory because it creates files.

The problem is that memcpy is called from FINgets with src and dest arguments that overlap, which is not allowed.

The fix is to replace the memcpy with memmove, where overlap is allowed.

[Bryce Harrington (bryce)]

Looks good, and looks like we ship the same version going back to lucid, so I packaged up and uploaded the fix for all releases.

review: Approve

[Bryce Harrington (bryce)]

Please set status to Merged.

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-12 00:02:00 +0000
+++ debian/changelog	2012-03-17 20:25:21 +0000
@@ -1,3 +1,9 @@
+mawk (1.3.3-15ubuntu3) natty; urgency=low
+
+  * Replace memcpy by memmove in FINgets; LP: #955791.
+
+ -- Tom de Vries <[e-mail]>  Sat, 17 Mar 2012 21:04:54 +0100
+
 mawk (1.3.3-15ubuntu2) lucid; urgency=low
 
   * Compute md5sums; Debian #507315.

=== modified file 'fin.c'
--- fin.c	2003-05-30 15:24:50 +0000
+++ fin.c	2012-03-17 20:25:21 +0000
@@ -326,7 +326,7 @@
       /* move a partial line to front of buffer and try again */
       unsigned rr ;
 
-      p = (char *) memcpy(fin->buff, p, r = strlen(p)) ;
+      p = (char *) memmove(fin->buff, p, r = strlen(p)) ;
       q = p+r ;	 rr = fin->nbuffs*BUFFSZ - r ;
 
       if ((r = fillbuff(fin->fd, q, rr)) < rr)