[openoffice.org/f14/master: 2/2] Resolves: rhbz#674330 dereference of NULL mpBase

[Caolan McNamara]

commit f93e2f717e29c3369fab3ecbf3e998d5a5d27432
Merge: eeece46 e68e93e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 16 16:50:38 2011 +0000

    Resolves: rhbz#674330 dereference of NULL mpBase

 ...-don-t-crash-deregistering-diff.-platform.patch |  210 ++++++++++++++++++++
 ...-pushback-and-process-a-corrupt-extension.patch |   27 +++
 openoffice.org.spec                                |   11 +-
 3 files changed, 246 insertions(+), 2 deletions(-)
---
diff --cc openoffice.org.spec
index edaf882,1d21e8a..b6df1bc
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@@ -162,7 -162,8 +162,9 @@@ Patch78: 0001-Related-rhbz-672872-cance
  Patch79: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
  Patch80: 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
  Patch81: 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
- Patch82: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
+ Patch82: 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
+ Patch83: 0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
++Patch84: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
  
  %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
  %define instdir %{_libdir}
@@@ -1741,7 -1742,8 +1743,9 @@@ cp -p %{SOURCE5} external/unowinreg/uno
  %patch79 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch
  %patch80 -p1 -b .rhbz670020-crash-in-slidesorting.patch
  %patch81 -p1 -b .rhbz676539-handle-missing-pWindows-from-xW.patch
- %patch82 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
+ %patch82 -p1 -b .rhbz649310-don-t-crash-deregistering-diff.-platform.patch
+ %patch83 -p1 -b .rhbz666440-don-t-pushback-and-process-a-corrupt-extension.patch
++%patch84 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
  touch scripting/source/pyprov/delzip
  touch scripting/util/provider/beanshell/delzip
  touch scripting/util/provider/javascript/delzip
@@@ -3943,7 -3945,9 +3947,10 @@@ unopkg remove --shared org.openoffice.l
  - Resolves: rhbz#673819 crash on changing position of header/footer drawing object
  - Resolves: rhbz#670020 crash in slidesorting
  - Resolves: rhbz#676539 handle missing pWindows from xWindows
+ - Resolves: rhbz#649310 don't crash deregistering diff. platform ext.
+   (dtardon)
+ - Resolves: rhbz#666440 don't pushback and process a corrupt extension
 +- Resolves: rhbz#674330 dereference of NULL mpBase
  
  * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
  - Resolves: rhbz#671540 fix lonely )