[openoffice.org] identify the broken memcpy thats breaking idlc

[Caolan McNamara]

commit 02095a41604270c055cdce0a8cf1355d37b1ee50
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 8 13:43:12 2010 +0100

    identify the broken memcpy thats breaking idlc

 openoffice.org-3.3.0.ooo114410.idlcpp.memcpy.patch |   11 +++++++++++
 openoffice.org-gccXXXXX.idlc.patch                 |   17 -----------------
 openoffice.org.spec                                |    4 ++--
 3 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/openoffice.org-3.3.0.ooo114410.idlcpp.memcpy.patch b/openoffice.org-3.3.0.ooo114410.idlcpp.memcpy.patch
new file mode 100644
index 0000000..89e5ef9
--- /dev/null
+++ b/openoffice.org-3.3.0.ooo114410.idlcpp.memcpy.patch
@@ -0,0 +1,11 @@
+--- idlc/source/preproc/tokens.c	2010-09-08 13:23:54.000000000 +0100
++++ idlc/source/preproc/tokens.c	2010-09-08 13:24:20.000000000 +0100
+@@ -477,7 +477,7 @@
+             if (write(1, wbuf, OBS) != OBS)
+                 error(ERROR, "short write!");
+             if (wbp > &wbuf[OBS])
+-                memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
++                memmove(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
+             wbp -= OBS;
+         }
+     }
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 6ca8b0f..ddd52e5 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -112,7 +112,7 @@ Patch33: workspace.cmcfixes77.patch
 Patch34: workspace.sb126.patch
 Patch35: workspace.vcl114.patch
 Patch36: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
-Patch37: openoffice.org-gccXXXXX.idlc.patch
+Patch37: openoffice.org-3.3.0.ooo114410.idlcpp.memcpy.patch
 Patch38: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
 Patch39: workspace.vcl115.patch
 Patch40: workspace.cmcfixes78.patch
@@ -1641,7 +1641,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch34 -p1 -b .workspace.sb126.patch
 %patch35 -p0 -b .workspace.vcl114.patch
 %patch36 -p0 -b .ooo113273.desktop.resolvelinks.patch
-%patch37 -p1 -b .gccXXXXX.idlc.patch
+%patch37 -p0 -b .ooo114410.idlcpp.memcpy.patch
 %patch38 -p0 -b .ooo106591.sal.tradcopy.patch
 %patch39 -p1 -b .workspace.vcl115.patch
 %patch40 -p1 -b .workspace.cmcfixes78.patch