Bug 1318974 - Cleanup the _pendingMessages array even if getNextPendingMessage never returns null, r=aleth. a=aleth CLOSED TREE

--HG-- extra : amend_source : 41533c424d166323e4650497c309f882f44294f2
2016-11-21 01:04:57 +01:00 · 2016-11-21 01:04:57 +01:00 · ec562b8ce5
--- a/chat/content/convbrowser.xml
+++ b/chat/content/convbrowser.xml
@ -417,12 +417,18 @@
      <method name="getNextPendingMessage">
        <body>
          <![CDATA[
-            if (this._nextPendingMessageIndex == this._pendingMessages.length) {
+            let length = this._pendingMessages.length;
+            if (this._nextPendingMessageIndex == length)
+              return null;
+
+            let result = this._pendingMessages[this._nextPendingMessageIndex++];
+
+            if (this._nextPendingMessageIndex == length) {
              this._pendingMessages = [];
              this._nextPendingMessageIndex = 0;
-              return null;
            }
-            return this._pendingMessages[this._nextPendingMessageIndex++];
+
+            return result;
          ]]>
        </body>
      </method>