From 348eff25b222ceca3f9fd3b7f489f69e5bcc9629 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Thu, 23 Jan 2003 03:35:30 +0000 Subject: [PATCH] Fixing bustage in nsXPIDLString. r=jag, sr=dbaron, b=189591, a=Donald Rumsfeld git-svn-id: svn://10.0.0.236/trunk@136865 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/src/nsXPIDLString.cpp | 4 ++-- mozilla/xpcom/string/src/nsXPIDLString.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/string/src/nsXPIDLString.cpp b/mozilla/string/src/nsXPIDLString.cpp index 5ea9266b732..f3c7b9c3422 100644 --- a/mozilla/string/src/nsXPIDLString.cpp +++ b/mozilla/string/src/nsXPIDLString.cpp @@ -156,7 +156,7 @@ nsXPIDLString::GetSharedEmptyBufferHandle() // race to set the refcount, in // which case we'll pull the // same trick in |Destroy|. - sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() & shared_buffer_handle_type::kIsNULL); + sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() | shared_buffer_handle_type::kIsNULL); } return sBufferHandle; } @@ -239,7 +239,7 @@ nsXPIDLCString::GetSharedEmptyBufferHandle() // race to set the refcount, in // which case we'll pull the // same trick in |Destroy|. - sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() & shared_buffer_handle_type::kIsNULL); + sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() | shared_buffer_handle_type::kIsNULL); } return sBufferHandle; } diff --git a/mozilla/xpcom/string/src/nsXPIDLString.cpp b/mozilla/xpcom/string/src/nsXPIDLString.cpp index 5ea9266b732..f3c7b9c3422 100644 --- a/mozilla/xpcom/string/src/nsXPIDLString.cpp +++ b/mozilla/xpcom/string/src/nsXPIDLString.cpp @@ -156,7 +156,7 @@ nsXPIDLString::GetSharedEmptyBufferHandle() // race to set the refcount, in // which case we'll pull the // same trick in |Destroy|. - sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() & shared_buffer_handle_type::kIsNULL); + sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() | shared_buffer_handle_type::kIsNULL); } return sBufferHandle; } @@ -239,7 +239,7 @@ nsXPIDLCString::GetSharedEmptyBufferHandle() // race to set the refcount, in // which case we'll pull the // same trick in |Destroy|. - sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() & shared_buffer_handle_type::kIsNULL); + sBufferHandle->SetImplementationFlags(sBufferHandle->GetImplementationFlags() | shared_buffer_handle_type::kIsNULL); } return sBufferHandle; }