Fix for bug 126463 (Occurances of uninitialized variables being used before being set (in extensions/transformiix).) r=sicking, sr=jst, a=asa.

content/base/src/nsSyncLoadService.cpp

@@ -226,27 +226,26 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDocument *aLoader, nsIDOMDocu
 
     nsCOMPtr<nsIEventQueue> currentThreadQ;
     rv = service->PushThreadEventQueue(getter_AddRefs(currentThreadQ));
-    NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     // Register as a load listener on the document
     nsCOMPtr<nsIDOMEventReceiver> target = do_QueryInterface(DOMDocument);
-    txLoadListenerProxy* proxy;
-    if (target) {
-        nsWeakPtr requestWeak = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this)));
-        proxy = new txLoadListenerProxy(requestWeak);
-        if (!proxy) {
-            service->PopThreadEventQueue(currentThreadQ);
-            return NS_ERROR_OUT_OF_MEMORY;
-        }
+    NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);
 
-        // This will addref the proxy
-        rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
-                                                          proxy), 
-                                           NS_GET_IID(nsIDOMLoadListener));
-        if (NS_FAILED(rv)) {
-            service->PopThreadEventQueue(currentThreadQ);
-            return rv;
-        }
+    nsWeakPtr requestWeak = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this)));
+    txLoadListenerProxy* proxy = new txLoadListenerProxy(requestWeak);
+    if (!proxy) {
+        service->PopThreadEventQueue(currentThreadQ);
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    // This will addref the proxy
+    rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
+                                                      proxy), 
+                                       NS_GET_IID(nsIDOMLoadListener));
+    if (NS_FAILED(rv)) {
+        service->PopThreadEventQueue(currentThreadQ);
+        return rv;
     }
     
     mLoadSuccess = PR_FALSE;

extensions/transformiix/source/xml/parser/nsSyncLoader.cpp

@@ -226,27 +226,26 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDocument *aLoader, nsIDOMDocu
 
     nsCOMPtr<nsIEventQueue> currentThreadQ;
     rv = service->PushThreadEventQueue(getter_AddRefs(currentThreadQ));
-    NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     // Register as a load listener on the document
     nsCOMPtr<nsIDOMEventReceiver> target = do_QueryInterface(DOMDocument);
-    txLoadListenerProxy* proxy;
-    if (target) {
-        nsWeakPtr requestWeak = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this)));
-        proxy = new txLoadListenerProxy(requestWeak);
-        if (!proxy) {
-            service->PopThreadEventQueue(currentThreadQ);
-            return NS_ERROR_OUT_OF_MEMORY;
-        }
+    NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);
 
-        // This will addref the proxy
-        rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
-                                                          proxy), 
-                                           NS_GET_IID(nsIDOMLoadListener));
-        if (NS_FAILED(rv)) {
-            service->PopThreadEventQueue(currentThreadQ);
-            return rv;
-        }
+    nsWeakPtr requestWeak = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this)));
+    txLoadListenerProxy* proxy = new txLoadListenerProxy(requestWeak);
+    if (!proxy) {
+        service->PopThreadEventQueue(currentThreadQ);
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    // This will addref the proxy
+    rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
+                                                      proxy), 
+                                       NS_GET_IID(nsIDOMLoadListener));
+    if (NS_FAILED(rv)) {
+        service->PopThreadEventQueue(currentThreadQ);
+        return rv;
     }
     
     mLoadSuccess = PR_FALSE;

extensions/transformiix/source/xpath/ExprParser.cpp

@@ -72,7 +72,7 @@ AttributeValueTemplate* ExprParser::createAttributeValueTemplate
     String buffer;
     MBool inExpr    = MB_FALSE;
     MBool inLiteral = MB_FALSE;
-    UNICODE_CHAR endLiteral;
+    UNICODE_CHAR endLiteral = 0;
 
     nextCh = attValue.charAt(cc);
     while (cc++ < size) {

extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp

@@ -119,7 +119,6 @@ ExprResult* txFormatNumberFunctionCall::evaluate(Node* aContext,
     int multiplier=1;
     int groupSize=-1;
 
-    UNICODE_CHAR c;
     int pos=0;
     int formatLen = formatStr.length();
     MBool inQuote;
@@ -148,6 +147,7 @@ ExprResult* txFormatNumberFunctionCall::evaluate(Node* aContext,
     FormatParseState pState = Prefix;
     inQuote = MB_FALSE;
 
+    UNICODE_CHAR c = 0;
     while (pos < formatLen && pState != Finished) {
         c=formatStr.charAt(pos++);