[mojo-edk] Fix uninitialized reads in EDK dispatchers

mojo/edk/system/data_pipe_consumer_dispatcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 500 matching lines @@
   UpdateSignalsStateNoLock();
 }
 
 void DataPipeConsumerDispatcher::UpdateSignalsStateNoLock() {
   lock_.AssertAcquired();
 
   bool was_peer_closed = peer_closed_;
   size_t previous_bytes_available = bytes_available_;
 
   ports::PortStatus port_status;
-  if (node_controller_->node()->GetStatus(control_port_, &port_status) !=
-          ports::OK ||
-      !port_status.receiving_messages) {
+  int rv = node_controller_->node()->GetStatus(control_port_, &port_status);
+  if (rv != ports::OK || !port_status.receiving_messages) {
     DVLOG(1) << "Data pipe consumer " << pipe_id_ << " is aware of peer closure"
              << " [control_port=" << control_port_.name() << "]";
-
     peer_closed_ = true;
-  }
-
-  if (port_status.has_messages && !in_transit_) {
+  } else if (rv == ports::OK && port_status.has_messages && !in_transit_) {
     ports::ScopedMessage message;
     do {
       int rv = node_controller_->node()->GetMessageIf(control_port_, nullptr,
                                                       &message);
       if (rv != ports::OK)
         peer_closed_ = true;
       if (message) {
         const DataPipeControlMessage* m =
             static_cast<const DataPipeControlMessage*>(
                 message->payload_bytes());
@@ skipping 21 matching lines @@
   }
 
   if (peer_closed_ != was_peer_closed ||
       bytes_available_ != previous_bytes_available) {
     awakable_list_.AwakeForStateChange(GetHandleSignalsStateNoLock());
   }
 }
 
 }  // namespace edk
 }  // namespace mojo