Bug 744297 - initialize return value in nsXULPrototypeElement::Deserialize. r=bz
authorAndrew McCreight <amccreight@mozilla.com>
Wed, 11 Apr 2012 07:48:14 -0700
changeset 91412 c124fc77aab2226eccd05c002018eb75e7e8b02e
parent 91411 f097e8dcb6f21878b1c16a587a30467ba8407bcc
child 91413 2fcf9cbedd48f5303fd1d0d426390b9ebc9c25d7
push id8205
push useramccreight@mozilla.com
push dateWed, 11 Apr 2012 14:48:47 +0000
treeherdermozilla-inbound@c124fc77aab2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs744297
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 744297 - initialize return value in nsXULPrototypeElement::Deserialize. r=bz
content/xul/content/src/nsXULElement.cpp
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -2681,21 +2681,20 @@ nsXULPrototypeElement::Serialize(nsIObje
 
 nsresult
 nsXULPrototypeElement::Deserialize(nsIObjectInputStream* aStream,
                                    nsIScriptGlobalObject* aGlobal,
                                    nsIURI* aDocumentURI,
                                    const nsCOMArray<nsINodeInfo> *aNodeInfos)
 {
     NS_PRECONDITION(aNodeInfos, "missing nodeinfo array");
-    nsresult rv;
 
     // Read Node Info
     PRUint32 number;
-    rv |= aStream->Read32(&number);
+    nsresult rv = aStream->Read32(&number);
     mNodeInfo = aNodeInfos->SafeObjectAt(number);
     if (!mNodeInfo)
         return NS_ERROR_UNEXPECTED;
 
     // Read Attributes
     rv |= aStream->Read32(&number);
     mNumAttributes = PRInt32(number);