summaryrefslogtreecommitdiff
path: root/www/libxul19/files/patch-bug573210
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-02-19 23:53:07 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-02-19 23:53:07 +0000
commitd39d92427cf19e39875ec26ae210fabeb83cbef7 (patch)
tree66e4b5fe2e01745bb6976e49907691f64a0c9d3b /www/libxul19/files/patch-bug573210
parent- Support using OpenSSL from ports (diff)
- update firefox to 19.0
- update firefox-esr, thunderbird, linux-firefox, linux-thunderbird to 17.0.3 - update linux-seamonkey to 2.16 - update nspr to 4.9.5 - update nss to 3.14.3 - add DuckDuckGo search plugin to firefox [1] - mark kompozer deprecated - clang fixes for www/libxul19 [2] Security: http://www.vuxml.org/freebsd/e3f0374a-7ad6-11e2-84cd-d43d7e0c7c02.html Submitted by: DuckDuckGo [1], dim [2] In collaboration with: Jan Beich <jbeich@tormail.org>
Diffstat (limited to 'www/libxul19/files/patch-bug573210')
-rw-r--r--www/libxul19/files/patch-bug573210223
1 files changed, 223 insertions, 0 deletions
diff --git a/www/libxul19/files/patch-bug573210 b/www/libxul19/files/patch-bug573210
new file mode 100644
index 000000000000..754c3eaf2062
--- /dev/null
+++ b/www/libxul19/files/patch-bug573210
@@ -0,0 +1,223 @@
+changeset: 46457:2c778979f15a
+user: Eli Friedman <sharparrow1@yahoo.com>
+date: Wed Jun 30 23:11:43 2010 +0200
+summary: Bug 573210 - Consistently qualify accesses to dependent base classes in xpcom C++ code. r=dbaron
+
+diff -r 93fabb73299b -r 2c778979f15a xpcom/base/nsAutoRef.h
+--- xpcom/base/nsAutoRef.h Wed Jun 30 23:11:41 2010 +0200
++++ xpcom/base/nsAutoRef.h Wed Jun 30 23:11:43 2010 +0200
+@@ -301,7 +301,7 @@
+ }
+ ThisClass& operator=(RawRef aRefToCopy)
+ {
+- own(aRefToCopy);
++ this->own(aRefToCopy);
+ SafeAddRef();
+ return *this;
+ }
+@@ -323,7 +323,7 @@
+ void SafeAddRef()
+ {
+ if (this->HaveResource())
+- AddRef(this->get());
++ this->AddRef(this->get());
+ }
+ };
+
+@@ -690,7 +690,7 @@
+ void SafeRelease()
+ {
+ if (this->HaveResource())
+- Release(this->get());
++ this->Release(this->get());
+ }
+ };
+
+diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsBaseHashtable.h
+--- xpcom/glue/nsBaseHashtable.h Wed Jun 30 23:11:41 2010 +0200
++++ xpcom/glue/nsBaseHashtable.h Wed Jun 30 23:11:43 2010 +0200
+@@ -123,7 +123,7 @@
+ */
+ PRBool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const
+ {
+- EntryType* ent = GetEntry(aKey);
++ EntryType* ent = this->GetEntry(aKey);
+
+ if (!ent)
+ return PR_FALSE;
+@@ -160,7 +160,7 @@
+ */
+ PRBool Put(KeyType aKey, UserDataType aData)
+ {
+- EntryType* ent = PutEntry(aKey);
++ EntryType* ent = this->PutEntry(aKey);
+
+ if (!ent)
+ return PR_FALSE;
+@@ -174,7 +174,7 @@
+ * remove the data for the associated key
+ * @param aKey the key to remove from the hashtable
+ */
+- void Remove(KeyType aKey) { RemoveEntry(aKey); }
++ void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
+
+ /**
+ * function type provided by the application for enumeration.
+diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsClassHashtable.h
+--- xpcom/glue/nsClassHashtable.h Wed Jun 30 23:11:41 2010 +0200
++++ xpcom/glue/nsClassHashtable.h Wed Jun 30 23:11:43 2010 +0200
+@@ -57,6 +57,7 @@
+ public:
+ typedef typename KeyClass::KeyType KeyType;
+ typedef T* UserDataType;
++ typedef nsBaseHashtable< KeyClass, nsAutoPtr<T>, T* > base_type;
+
+ /**
+ * @copydoc nsBaseHashtable::Get
+@@ -80,6 +81,7 @@
+ public:
+ typedef typename KeyClass::KeyType KeyType;
+ typedef T* UserDataType;
++ typedef nsBaseHashtableMT< KeyClass, nsAutoPtr<T>, T* > base_type;
+
+ /**
+ * @copydoc nsBaseHashtable::Get
+@@ -97,8 +99,7 @@
+ PRBool
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+- typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+@@ -125,8 +126,7 @@
+ {
+ PR_Lock(this->mLock);
+
+- typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsInterfaceHashtable.h
+--- xpcom/glue/nsInterfaceHashtable.h Wed Jun 30 23:11:41 2010 +0200
++++ xpcom/glue/nsInterfaceHashtable.h Wed Jun 30 23:11:43 2010 +0200
+@@ -57,6 +57,8 @@
+ public:
+ typedef typename KeyClass::KeyType KeyType;
+ typedef Interface* UserDataType;
++ typedef nsBaseHashtable< KeyClass, nsCOMPtr<Interface> , Interface* >
++ base_type;
+
+ /**
+ * @copydoc nsBaseHashtable::Get
+@@ -87,6 +89,8 @@
+ public:
+ typedef typename KeyClass::KeyType KeyType;
+ typedef Interface* UserDataType;
++ typedef nsBaseHashtableMT< KeyClass, nsCOMPtr<Interface> , Interface* >
++ base_type;
+
+ /**
+ * @copydoc nsBaseHashtable::Get
+@@ -110,8 +114,7 @@
+ nsInterfaceHashtable<KeyClass,Interface>::Get
+ (KeyType aKey, UserDataType* pInterface) const
+ {
+- typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+@@ -138,8 +141,7 @@
+ nsInterfaceHashtable<KeyClass,Interface>::GetWeak
+ (KeyType aKey, PRBool* aFound) const
+ {
+- typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+@@ -166,8 +168,7 @@
+ {
+ PR_Lock(this->mLock);
+
+- typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsRefPtrHashtable.h
+--- xpcom/glue/nsRefPtrHashtable.h Wed Jun 30 23:11:41 2010 +0200
++++ xpcom/glue/nsRefPtrHashtable.h Wed Jun 30 23:11:43 2010 +0200
+@@ -58,6 +58,7 @@
+ public:
+ typedef typename KeyClass::KeyType KeyType;
+ typedef RefPtr* UserDataType;
++ typedef nsBaseHashtable< KeyClass, nsRefPtr<RefPtr> , RefPtr* > base_type;
+
+ /**
+ * @copydoc nsBaseHashtable::Get
+@@ -88,6 +89,7 @@
+ public:
+ typedef typename KeyClass::KeyType KeyType;
+ typedef RefPtr* UserDataType;
++ typedef nsBaseHashtableMT< KeyClass, nsRefPtr<RefPtr> , RefPtr* > base_type;
+
+ /**
+ * @copydoc nsBaseHashtable::Get
+@@ -111,8 +113,7 @@
+ nsRefPtrHashtable<KeyClass,RefPtr>::Get
+ (KeyType aKey, UserDataType* pRefPtr) const
+ {
+- typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+@@ -139,8 +140,7 @@
+ nsRefPtrHashtable<KeyClass,RefPtr>::GetWeak
+ (KeyType aKey, PRBool* aFound) const
+ {
+- typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+@@ -167,8 +167,7 @@
+ {
+ PR_Lock(this->mLock);
+
+- typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+- GetEntry(aKey);
++ typename base_type::EntryType* ent = this->GetEntry(aKey);
+
+ if (ent)
+ {
+diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsTPtrArray.h
+--- xpcom/glue/nsTPtrArray.h Wed Jun 30 23:11:41 2010 +0200
++++ xpcom/glue/nsTPtrArray.h Wed Jun 30 23:11:43 2010 +0200
+@@ -64,13 +64,13 @@
+
+ // Initialize this array and pre-allocate some number of elements.
+ explicit nsTPtrArray(size_type capacity) {
+- SetCapacity(capacity);
++ this->SetCapacity(capacity);
+ }
+
+ // The array's copy-constructor performs a 'deep' copy of the given array.
+ // @param other The array object to copy.
+ nsTPtrArray(const self_type& other) {
+- AppendElements(other);
++ this->AppendElements(other);
+ }
+
+ //