Fixing bug 312232. getScreenCTM fails in xulrunner builds due to uninitialized nsresult. Patched by Rob Adams <readams@readams.net>, r=me, sr=tor@acm.org

content/svg/content/src/nsSVGMarkerElement.cpp

@@ -416,6 +416,8 @@ nsSVGMarkerElement::GetMarkerTransform(float aStrokeWidth,
 NS_IMETHODIMP
 nsSVGMarkerElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval)
 {
+  nsresult rv = NS_OK;
+
   if (!mViewBoxToViewportTransform) {
     float viewportWidth;
     {
@@ -512,15 +514,15 @@ nsSVGMarkerElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval)
     printf("                            [b d f] = [   0,  %f, %f]\n", d, f);
 #endif
     
-    NS_NewSVGMatrix(getter_AddRefs(mViewBoxToViewportTransform),
-                    a,     0.0f,
-                    0.0f,  d,
-                    e,     f);
+    rv = NS_NewSVGMatrix(getter_AddRefs(mViewBoxToViewportTransform),
+                         a,     0.0f,
+                         0.0f,  d,
+                         e,     f);
   }
 
   *_retval = mViewBoxToViewportTransform;
   NS_IF_ADDREF(*_retval);
-  return NS_OK;
+  return rv;
 }
 
 //----------------------------------------------------------------------

content/svg/content/src/nsSVGSVGElement.cpp

@@ -806,7 +806,7 @@ nsSVGSVGElement::GetElementById(const nsAString & elementId, nsIDOMElement **_re
 NS_IMETHODIMP
 nsSVGSVGElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval)
 {
-  nsresult rv;
+  nsresult rv = NS_OK;
 
   if (!mViewBoxToViewportTransform) {
     float viewportWidth;