rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch, 1.6, 1.7

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2889

Modified Files:
	openoffice.org-3.1.1.oooXXXXX.dmake.patch 
Log Message:
yet more overlapping strcpys

openoffice.org-3.1.1.oooXXXXX.dmake.patch:
 dmake/dag.c      |    9 ++++++---
 dmake/expand.c   |   26 +++++++++++++++++++-------
 dmake/getinp.c   |    6 ++++--
 dmake/path.c     |   10 +++++++---
 dmake/rulparse.c |    5 +++--
 make.c           |   15 ++++++++++-----
 6 files changed, 49 insertions(+), 22 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXX.dmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXX.dmake.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openoffice.org-3.1.1.oooXXXXX.dmake.patch	18 Aug 2009 08:40:20 -0000	1.6
+++ openoffice.org-3.1.1.oooXXXXX.dmake.patch	18 Aug 2009 19:25:07 -0000	1.7
@@ -73,7 +73,27 @@ diff -ru dmake.orig/expand.c dmake/expan
     }
  }
  
-@@ -727,8 +730,10 @@
+@@ -365,7 +368,8 @@
+       if( (e = Basename(s)) != s) {
+ 	 if( !(mod & DIRECTORY_FLAG) ) {
+ 	    /* Move the basename to the start. */
+-	    strcpy(s, e);
++	    size_t len = strlen(e)+1;
++	    memmove(s, e, len);
+ 	 }
+ 	 else
+ 	    s = e;
+@@ -382,7 +386,8 @@
+ 
+       if( !(mod & FILE_FLAG) ) {
+ 	 /* Move the suffix to the start. */
+-	 strcpy( s, e );
++	 size_t len = strlen(e)+1;
++         memmove(s, e, len);
+       }
+       else
+ 	 s = e;
+@@ -725,8 +730,10 @@
  	      done = !lev;
  	      break;
              } else {
@@ -85,7 +105,7 @@ diff -ru dmake.orig/expand.c dmake/expan
  	    }
  	    /*FALLTHRU*/
  	 case ' ':
-@@ -837,8 +842,10 @@
+@@ -835,8 +842,10 @@
         * converted them to a real space. Let's verify this. */
        for( p=s; *p && *p != edelim && *p; p++ ) {
  	if( p[0] == '\\' && p[1] == '\n' ) {
@@ -97,7 +117,7 @@ diff -ru dmake.orig/expand.c dmake/expan
  	}
        }
        if( !*p )
-@@ -1122,7 +1129,10 @@
+@@ -1120,7 +1129,10 @@
        *flag = 1;
        res   = Expand( start );