rpms/openoffice.org/devel openoffice.org-3.1.1.oooXXXXX.dmake.patch, 1.6, 1.7
Caolan McNamara
caolanm at fedoraproject.org
Tue Aug 18 19:25:07 UTC 2009
- Previous message: rpms/policycoreutils/devel .cvsignore, 1.200, 1.201 policycoreutils-rhat.patch, 1.428, 1.429 policycoreutils-sepolgen.patch, 1.25, 1.26 policycoreutils.spec, 1.622, 1.623 sources, 1.208, 1.209
- Next message: rpms/kernel/devel patch-2.6.31-rc6-git3.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.23, 1.1014.2.24 Makefile.config, 1.70.6.2, 1.70.6.3 config-generic, 1.238.6.34, 1.238.6.35 config-sparc64-generic, 1.21.6.6, 1.21.6.7 config-x86-generic, 1.68.6.17, 1.68.6.18 config-x86_64-generic, 1.68.2.15, 1.68.2.16 kernel.spec, 1.1294.2.52, 1.1294.2.53 linux-2.6.31-lirc.patch, 1.2.2.4, 1.2.2.5 perf, 1.2.2.2, 1.2.2.3 sources, 1.976.2.24, 1.976.2.25 upstream, 1.888.2.23, 1.888.2.24 xen.pvops.patch, 1.1.2.33, 1.1.2.34 xen.pvops.post.patch, 1.1.2.20, 1.1.2.21 config-powerpc64-kdump, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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 );
- Previous message: rpms/policycoreutils/devel .cvsignore, 1.200, 1.201 policycoreutils-rhat.patch, 1.428, 1.429 policycoreutils-sepolgen.patch, 1.25, 1.26 policycoreutils.spec, 1.622, 1.623 sources, 1.208, 1.209
- Next message: rpms/kernel/devel patch-2.6.31-rc6-git3.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.23, 1.1014.2.24 Makefile.config, 1.70.6.2, 1.70.6.3 config-generic, 1.238.6.34, 1.238.6.35 config-sparc64-generic, 1.21.6.6, 1.21.6.7 config-x86-generic, 1.68.6.17, 1.68.6.18 config-x86_64-generic, 1.68.2.15, 1.68.2.16 kernel.spec, 1.1294.2.52, 1.1294.2.53 linux-2.6.31-lirc.patch, 1.2.2.4, 1.2.2.5 perf, 1.2.2.2, 1.2.2.3 sources, 1.976.2.24, 1.976.2.25 upstream, 1.888.2.23, 1.888.2.24 xen.pvops.patch, 1.1.2.33, 1.1.2.34 xen.pvops.post.patch, 1.1.2.20, 1.1.2.21 config-powerpc64-kdump, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list