rpms/openoffice.org/FC-5 openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, NONE, 1.1 openoffice.org.spec, 1.671, 1.672 openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 30 07:30:58 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2798
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
Removed Files:
openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
Log Message:
workaround visibility options
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
cppuhelper/inc/cppuhelper/implbase1.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase10.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase11.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase12.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase2.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase3.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase4.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase5.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase6.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase7.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase8.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase9.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 16 ++++++++++++++++
inc/cppuhelper/implbase1.hxx | 0
inc/cppuhelper/implbase10.hxx | 0
inc/cppuhelper/implbase11.hxx | 0
inc/cppuhelper/implbase12.hxx | 0
inc/cppuhelper/implbase2.hxx | 0
inc/cppuhelper/implbase3.hxx | 0
inc/cppuhelper/implbase4.hxx | 0
inc/cppuhelper/implbase5.hxx | 0
inc/cppuhelper/implbase6.hxx | 0
inc/cppuhelper/implbase7.hxx | 0
inc/cppuhelper/implbase8.hxx | 0
inc/cppuhelper/implbase9.hxx | 0
inc/cppuhelper/implbase_ex.hxx | 0
26 files changed, 28 insertions(+), 12 deletions(-)
--- NEW FILE openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch ---
Index: inc/cppuhelper/implbase1.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase1.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx 5 Oct 2005 14:23:42 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx 29 Jun 2006 11:50:44 -0000
@@ -68,7 +71,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase10.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase10.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx 5 Oct 2005 14:24:09 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx 29 Jun 2006 11:50:45 -0000
@@ -78,7 +78,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase11.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase11.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx 5 Oct 2005 14:24:35 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx 29 Jun 2006 11:50:45 -0000
@@ -79,7 +79,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase12.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase12.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx 5 Oct 2005 14:25:08 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx 29 Jun 2006 11:50:45 -0000
@@ -80,7 +80,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase2.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase2.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx 5 Oct 2005 14:25:28 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx 29 Jun 2006 11:50:45 -0000
@@ -69,7 +69,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase3.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase3.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx 5 Oct 2005 14:25:47 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx 29 Jun 2006 11:50:46 -0000
@@ -70,7 +70,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase4.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase4.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx 5 Oct 2005 14:26:03 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx 29 Jun 2006 11:50:46 -0000
@@ -72,7 +72,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase5.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase5.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx 5 Oct 2005 14:26:20 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx 29 Jun 2006 11:50:46 -0000
@@ -73,7 +73,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase6.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase6.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx 5 Oct 2005 14:26:37 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx 29 Jun 2006 11:50:48 -0000
@@ -74,7 +74,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase7.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase7.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx 5 Oct 2005 14:26:54 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx 29 Jun 2006 11:50:48 -0000
@@ -75,7 +75,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase8.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase8.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx 5 Oct 2005 14:27:12 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx 29 Jun 2006 11:50:48 -0000
@@ -76,7 +76,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase9.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
retrieving revision 1.15
diff -u -r1.15 implbase9.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx 5 Oct 2005 14:27:40 -0000 1.15
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx 29 Jun 2006 11:50:48 -0000
@@ -77,7 +77,7 @@
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
- return reinterpret_cast< class_data * >(&s_cd);
+ return class_data_fixup<Impl>(reinterpret_cast< class_data * >(&s_cd));
}
};
Index: inc/cppuhelper/implbase_ex.hxx
===================================================================
RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase_ex.hxx,v
retrieving revision 1.6
diff -u -r1.6 implbase_ex.hxx
--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase_ex.hxx 5 Oct 2005 14:27:57 -0000 1.6
+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase_ex.hxx 29 Jun 2006 11:50:48 -0000
@@ -53,6 +53,9 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
+#include <stdlib.h>
+#include <stdio.h>
+
/* If you need to define implementation helper classes that deal with more than
12 interfaces, then use macros as follows, e.g. for 3 interfaces:
@@ -117,6 +120,19 @@
*/
type_entry m_typeEntries[ 1 ];
};
+
+template<typename Impl> class_data* class_data_fixup(class_data *s_cd)
+{
+ if (!s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType)
+ {
+ fprintf(stderr, "Avert a fatal crash\n");
+ s_cd->m_typeEntries[s_cd->m_nTypes-1].m_type.getCppuType =
+ ::com::sun::star::lang::XTypeProvider::static_type;
+ s_cd->m_typeEntries[s_cd->m_nTypes-1].m_offset =
+ ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16;
+ }
+ return s_cd;
+}
/** ImplHelper
@internal
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -r1.671 -r1.672
--- openoffice.org.spec 28 Jun 2006 10:00:55 -0000 1.671
+++ openoffice.org.spec 30 Jun 2006 07:30:47 -0000 1.672
@@ -1,6 +1,6 @@
%define oootag OOB680
%define ooomilestone 5
-%define rh_rpm_release 15
+%define rh_rpm_release 16
%define build_fc5 1
@@ -176,7 +176,7 @@
Patch48: openoffice.org-2.0.3.oooXXXXX.safety.sfx2.patch
Patch49: disable-java-applets.diff
Patch50: sax+source+expatwrap+xml2utf.cxx.diff
-Patch51: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
+Patch51: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -836,7 +836,7 @@
%patch48 -p1 -b .oooXXXXX.safety.sfx2.patch
%patch49 -p1 -b .disable-java-applets.diff
%patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
-%patch51 -p1 -b .ooo66018.idlc.dangerousvisibility.patch
+%patch51 -p1 -b .cppuhelper.dangerousvisibility.patch
%if %{includingexternals}
@@ -3283,12 +3283,12 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.15
+* Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
- CVE-2006-2198 macro security
- CVE-2006-2199 java applets
- CVE-2006-3117 corrupt file format
- rh#195637# add openoffice.org-2.0.3.ooo65519.printing.samba.patch
-- add openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch to
+- add openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch to
fix visibility problem
* Thu Jun 08 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
--- openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch DELETED ---
More information about the fedora-cvs-commits
mailing list