Re: proposed mozilla-firefox security update, needs testing!
On Wed, Jun 28, 2006 at 12:44:50PM +0200, Alexander Sack wrote:
> On Wed, Jun 28, 2006 at 12:10:45PM +0200, Alexander Sack wrote:
> > On Tue, Jun 27, 2006 at 10:54:47PM -0400, Eric Dorland wrote:
> > > > >
> > > > > Could you send me a copy of your bookmarks.html file privately?
> > > >
> > > > Eric, was this reproducible?
> > >
> > > Unfortunately it was very reproducible :( I'm not sure how to
> > > proceed. Is anyone else using these patches that might be able to help
> > > figure out where the problem lies?
> > >
> >
> > No ... upstream does not do official rc testing for us. Though, if we can track
> > down which specific patch causes this regression, they will help to figure it
> > out.
> >
> > Did you try to track down which patch(es) cause these troubles?
>
> I tracked it. The evil patch is:
>
> 0005-mfsa2006-35-329677.txt
>
> ... reverting this fixes this resolves this regression ... I will investigate.
>
And here comes the fix. In addition I attached a fix for another regression.
Please respin and test with these two patches added.
- Alexander
--
GPG messages preferred. | .''`. ** Debian GNU/Linux **
Alexander Sack | : :' : The universal
asac@debian.org | `. `' Operating System
http://www.asoftsite.org/ | `- http://www.debian.org/
>From nobody Mon Sep 17 00:00:00 2001
From: Alexander Sack <asac@hanson.localdomain>
Date: Wed, 28 Jun 2006 12:53:56 +0200
Subject: [PATCH] mfsa2006-35; 335142; regression 1/2 for 329677
---
content/xul/templates/src/nsXULContentUtils.cpp | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
463bd4875866b9ac52c198cc38dfb26722cfb56f
diff --git a/content/xul/templates/src/nsXULContentUtils.cpp b/content/xul/templates/src/nsXULContentUtils.cpp
index 15d217b..bfbf602 100644
--- a/content/xul/templates/src/nsXULContentUtils.cpp
+++ b/content/xul/templates/src/nsXULContentUtils.cpp
@@ -70,7 +70,7 @@ #include "nsContentUtils.h"
#include "nsIDateTimeFormat.h"
#include "nsDateTimeFormatCID.h"
#include "nsIScriptableDateFormat.h"
-
+#include "nsIDOMXULElement.h"
static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
@@ -226,6 +226,10 @@ nsXULContentUtils::GetElementRefResource
NS_ASSERTION(NS_SUCCEEDED(rv), "severe error retrieving attribute");
if (NS_FAILED(rv)) return rv;
+ if (rv != NS_CONTENT_ATTR_HAS_VALUE) {
+ rv = aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::id, uri);
+ }
+
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
// We'll use rdf_MakeAbsolute() to translate this to a URL.
nsCOMPtr<nsIDocument> doc = aElement->GetDocument();
@@ -242,7 +246,10 @@ nsXULContentUtils::GetElementRefResource
rv = gRDF->GetUnicodeResource(uri, aResult);
}
else {
- rv = GetElementResource(aElement, aResult);
+ nsCOMPtr<nsIDOMXULElement> xulElem(do_QueryInterface(aElement, &rv));
+ if (xulElem) {
+ rv = xulElem->GetResource(aResult);
+ }
}
return rv;
--
1.3.3
>From nobody Mon Sep 17 00:00:00 2001
From: Alexander Sack <asac@hanson.localdomain>
Date: Wed, 28 Jun 2006 13:04:30 +0200
Subject: [PATCH] mfsa2006-35, 337841 - regression part 2/2 for 329677
---
content/xul/templates/src/nsXULSortService.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
96a0d1579e945ea50e0c31fc2e0b27638d751a7b
diff --git a/content/xul/templates/src/nsXULSortService.cpp b/content/xul/templates/src/nsXULSortService.cpp
index 67de503..f9223c2 100644
--- a/content/xul/templates/src/nsXULSortService.cpp
+++ b/content/xul/templates/src/nsXULSortService.cpp
@@ -1403,7 +1403,7 @@ XULSortServiceImpl::InsertContainerNode(
if (!id.IsEmpty()) {
nsCOMPtr<nsIRDFResource> containerRes;
- gRDFService->GetUnicodeResource(id, getter_AddRefs(containerRes));
+ rv = gRDFService->GetUnicodeResource(id, getter_AddRefs(containerRes));
if (NS_SUCCEEDED(rv))
rv = gRDFC->IsSeq(sortInfo.db, containerRes, &isContainerRDFSeq);
}
--
1.3.3
Reply to: