|
[-]
[+]
|
Changed |
seamonkey.changes
|
|
|
|
[-]
[+]
|
Changed |
seamonkey.spec
^
|
|
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/browser/config/version.txt
^
|
| @@ -1 +1 @@
-2.0.0.15
+2.0.0.16
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/client.mk
^
|
| @@ -257,11 +257,11 @@
#
# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
# and commit this file on that tag.
-MOZ_CO_TAG = SEAMONKEY_1_1_10_RELEASE
-NSPR_CO_TAG = SEAMONKEY_1_1_10_RELEASE
-NSS_CO_TAG = SEAMONKEY_1_1_10_RELEASE
-LDAPCSDK_CO_TAG = SEAMONKEY_1_1_10_RELEASE
-LOCALES_CO_TAG = SEAMONKEY_1_1_10_RELEASE
+MOZ_CO_TAG = SEAMONKEY_1_1_11_RELEASE
+NSPR_CO_TAG = SEAMONKEY_1_1_11_RELEASE
+NSS_CO_TAG = SEAMONKEY_1_1_11_RELEASE
+LDAPCSDK_CO_TAG = SEAMONKEY_1_1_11_RELEASE
+LOCALES_CO_TAG = SEAMONKEY_1_1_11_RELEASE
NSS_FIPS_CO_TAG = NSS_3_11_4_RTM
NSS_FIPS_CO_DIR = nss-fips
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/config/milestone.txt
^
|
| @@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
-1.8.1.15
+1.8.1.16
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/layout/style/nsCSSValue.h
^
|
| @@ -322,10 +322,18 @@
}
void AddRef() {
+ if (mRefCnt == PR_UINT16_MAX) {
+ NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
+ return;
+ }
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
}
void Release() {
+ if (mRefCnt == PR_UINT16_MAX) {
+ NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
+ return;
+ }
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
if (mRefCnt == 0)
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/mail/config/version.txt
^
|
| @@ -1 +1 @@
-2.0.0.15pre
+2.0.0.16pre
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/rdf/base/src/nsInMemoryDataSource.cpp
^
|
| @@ -157,11 +157,22 @@
~Assertion();
- void AddRef() { ++mRefCnt; }
+ void AddRef() {
+ if (mRefCnt == PR_UINT16_MAX) {
+ NS_WARNING("refcount overflow, leaking Assertion");
+ return;
+ }
+ ++mRefCnt;
+ }
void Release(nsFixedSizeAllocator& aAllocator) {
+ if (mRefCnt == PR_UINT16_MAX) {
+ NS_WARNING("refcount overflow, leaking Assertion");
+ return;
+ }
if (--mRefCnt == 0)
- Destroy(aAllocator, this); }
+ Destroy(aAllocator, this);
+ }
// For nsIRDFPurgeableDataSource
inline void Mark() { u.as.mMarked = PR_TRUE; }
@@ -194,7 +205,7 @@
// also shared between hash/as (see the union above)
// but placed after union definition to ensure that
// all 32-bit entries are long aligned
- PRInt16 mRefCnt;
+ PRUint16 mRefCnt;
PRPackedBool mHashEntry;
private:
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/security/manager/ssl/src/nsClientAuthRemember.cpp
^
|
| @@ -58,8 +58,9 @@
#include "nsNSSCleaner.h"
NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsClientAuthRememberService,
- nsIObserver)
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsClientAuthRememberService,
+ nsIObserver,
+ nsISupportsWeakReference)
nsClientAuthRememberService::nsClientAuthRememberService()
{
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/security/manager/ssl/src/nsClientAuthRemember.h
^
|
| @@ -46,6 +46,7 @@
#include "nsAutoPtr.h"
#include "nsNSSCertificate.h"
#include "nsString.h"
+#include "nsWeakReference.h"
#include "prmon.h"
class nsClientAuthRemember
@@ -138,7 +139,8 @@
nsCString mHostWithCert;
};
-class nsClientAuthRememberService : public nsIObserver
+class nsClientAuthRememberService : public nsIObserver,
+ public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/security/manager/ssl/src/nsNSSComponent.cpp
^
|
| @@ -290,7 +290,9 @@
mObserversRegistered = PR_FALSE;
nsSSLIOLayerHelpers::Init();
- mClientAuthRememberService.Init();
+ mClientAuthRememberService = new nsClientAuthRememberService;
+ if (mClientAuthRememberService)
+ mClientAuthRememberService->Init();
NS_ASSERTION( (0 == mInstanceCount), "nsNSSComponent is a singleton, but instantiated multiple times!");
++mInstanceCount;
@@ -1554,7 +1556,9 @@
ShutdownSmartCardThreads();
SSL_ClearSessionCache();
- mClientAuthRememberService.ClearRememberedDecisions();
+ if (mClientAuthRememberService) {
+ mClientAuthRememberService->ClearRememberedDecisions();
+ }
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("evaporating psm resources\n"));
mShutdownObjectList->evaporateAllNSSResources();
if (SECSuccess != ::NSS_Shutdown()) {
@@ -2044,7 +2048,9 @@
nsresult nsNSSComponent::LogoutAuthenticatedPK11()
{
- mClientAuthRememberService.ClearRememberedDecisions();
+ if (mClientAuthRememberService) {
+ mClientAuthRememberService->ClearRememberedDecisions();
+ }
return mShutdownObjectList->doPK11Logout();
}
@@ -2115,7 +2121,8 @@
nsNSSComponent::GetClientAuthRememberService(nsClientAuthRememberService **cars)
{
NS_ENSURE_ARG_POINTER(cars);
- *cars = &mClientAuthRememberService;
+ NS_IF_ADDREF(*cars = mClientAuthRememberService);
+ return NS_OK;
}
//---------------------------------------------
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/security/manager/ssl/src/nsNSSComponent.h
^
|
| @@ -278,7 +278,7 @@
nsSSLThread *mSSLThread;
nsCertVerificationThread *mCertVerificationThread;
nsNSSHttpInterface mHttpForNSS;
- nsClientAuthRememberService mClientAuthRememberService;
+ nsRefPtr<nsClientAuthRememberService> mClientAuthRememberService;
};
class PSMContentListener : public nsIURIContentListener,
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/security/manager/ssl/src/nsNSSIOLayer.cpp
^
|
| @@ -2407,15 +2407,9 @@
nsresult rv;
NS_DEFINE_CID(nssComponentCID, NS_NSSCOMPONENT_CID);
nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(nssComponentCID, &rv));
- // it's ok to keep our raw pointer to the nsClientAuthRememberService
- // as long as we hold the reference to the nssComponent.
- // Yes, this sucks, but this is branch only code,
- // and I don't want to deal with new interfaces, and want to use full
- // typed pointers.
- // Note nsINSSComponent is NOT exposed to anywhere outside of PSM.
- nsClientAuthRememberService *cars = nsnull;
+ nsRefPtr<nsClientAuthRememberService> cars;
if (nssComponent) {
- nssComponent->GetClientAuthRememberService(&cars);
+ nssComponent->GetClientAuthRememberService(getter_AddRefs(cars));
}
PRBool hasRemembered = PR_FALSE;
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/xpfe/bootstrap/module.ver
^
|
| @@ -1,7 +1,7 @@
WIN32_MODULE_COMPANYNAME=mozilla.org
WIN32_MODULE_COPYRIGHT=©Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_PRODUCTVERSION=1,1,10,0
-WIN32_MODULE_PRODUCTVERSION_STRING=1.1.10
+WIN32_MODULE_PRODUCTVERSION=1,1,11,0
+WIN32_MODULE_PRODUCTVERSION_STRING=1.1.11
WIN32_MODULE_TRADEMARKS=SeaMonkey and Mozilla are trademarks of The Mozilla Foundation.
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
|
|
[-]
[+]
|
Changed |
seamonkey-source-1.1.11.tar.bz2/xpfe/bootstrap/version.txt
^
|
| @@ -1 +1 @@
-1.1.10
\ No newline at end of file
+1.1.11
\ No newline at end of file
|
