From 74e7c2ed3d40424f57622548a5c8a212a2a87f19 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Sat, 5 Dec 2015 09:36:51 +0000
Subject: [PATCH] iBug 1122788 - patch 2 - nsMultiplexInputStream should not
 use Tell() in debug builds, r=bz

---
 dom/base/test/test_fileapi.html     | 2 +-
 dom/ipc/Blob.cpp                    | 6 +++---
 xpcom/io/nsMultiplexInputStream.cpp | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dom/base/test/test_fileapi.html b/dom/base/test/test_fileapi.html
index e0299866ec5..fc33c7ae6c0 100644
--- a/dom/base/test/test_fileapi.html
+++ b/dom/base/test/test_fileapi.html
@@ -382,7 +382,7 @@ function onFilesOpened(message) {
     testHasRun();
   };
   r.onload = function (event) {
-    todo(false, "nonexistent file shouldn't load! (FIXME: bug 1122788)");
+    is(false, "nonexistent file shouldn't load! (FIXME: bug 1122788)");
     testHasRun();
   };
   try {
diff --git a/dom/ipc/Blob.cpp b/dom/ipc/Blob.cpp
index cee6625e790..965a07139c7 100644
--- a/dom/ipc/Blob.cpp
+++ b/dom/ipc/Blob.cpp
@@ -1165,9 +1165,9 @@ RemoteInputStream::ReallyBlockAndWaitForStream()
 #ifdef DEBUG
   if (waited && mWeakSeekableStream) {
     int64_t position;
-    MOZ_ASSERT(NS_SUCCEEDED(mWeakSeekableStream->Tell(&position)),
-                "Failed to determine initial stream position!");
-    MOZ_ASSERT(!position, "Stream not starting at 0!");
+    if (NS_SUCCEEDED(mWeakSeekableStream->Tell(&position))) {
+      MOZ_ASSERT(!position, "Stream not starting at 0!");
+    }
   }
 #endif
 }
diff --git a/xpcom/io/nsMultiplexInputStream.cpp b/xpcom/io/nsMultiplexInputStream.cpp
index 030b307e763..ed96295e8df 100644
--- a/xpcom/io/nsMultiplexInputStream.cpp
+++ b/xpcom/io/nsMultiplexInputStream.cpp
@@ -214,15 +214,14 @@ nsMultiplexInputStream::Available(uint64_t* aResult)
     return mStatus;
   }
 
-  nsresult rv;
   uint64_t avail = 0;
 
   uint32_t len = mStreams.Length();
   for (uint32_t i = mCurrentStream; i < len; i++) {
     uint64_t streamAvail;
-    rv = AvailableMaybeSeek(mStreams[i], &streamAvail);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+    mStatus = AvailableMaybeSeek(mStreams[i], &streamAvail);
+    if (NS_WARN_IF(NS_FAILED(mStatus))) {
+      return mStatus;
     }
     avail += streamAvail;
   }