rpms/xulrunner/F-12 mozilla-499295.patch, NONE, 1.1 xulrunner.spec, 1.188, 1.189

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26806

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-499295.patch 
Log Message:
Added fix for mozbz#499295

mozilla-499295.patch:
 nsPluginInstancePeer.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE mozilla-499295.patch ---
From: timeless at mozdev.org

Bug 499295 NULL crash [@ nsPluginInstancePeerImpl::GetJSContext]
r=jst sr=jst

diff --git a/modules/plugin/base/src/nsPluginInstancePeer.cpp b/modules/plugin/base/src/nsPluginInstancePeer.cpp
--- a/modules/plugin/base/src/nsPluginInstancePeer.cpp
+++ b/modules/plugin/base/src/nsPluginInstancePeer.cpp
@@ -689,8 +689,10 @@ nsPluginInstancePeerImpl::GetJSContext(J
 {
   *outContext = NULL;
   nsresult rv = NS_ERROR_FAILURE;
+  if (!mOwner)
+    return rv;
+
   nsCOMPtr<nsIDocument> document;
-
   rv = mOwner->GetDocument(getter_AddRefs(document));
 
   if (NS_SUCCEEDED(rv) && document) {


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- xulrunner.spec	10 May 2010 09:33:50 -0000	1.188
+++ xulrunner.spec	17 May 2010 12:08:01 -0000	1.189
@@ -15,7 +15,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -34,6 +34,7 @@ Patch4:         mozilla-about-firefox-ve
 Patch5:         xulrunner-gtk-include.patch
 Patch6:         mozilla-libnotify.patch
 Patch7:         mozilla-516124.patch
+Patch8:         mozilla-499295.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
@@ -162,6 +163,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch5  -p1 -b .gtk-include
 %patch6  -p1 -b .libnotify
 %patch7  -p1 -b .516124
+%patch8  -p1 -b .499295
 
 %patch10 -p1 -b .pk
 
@@ -481,6 +483,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon May 17 2010 Martin Stransky <stransky at redhat.com> - 1.9.1.9-3
+- Added fix for mozbz#499295
+
 * Mon May 10 2010 Martin Stransky <stransky at redhat.com> - 1.9.1.9-2
 - Added fix for mozbz#516124