Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e61a630 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Check startup_future before using it"

parents 2157782f d7aefbf8

system/hci/src/hci_layer.cc

+6 −1
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ static void event_finish_startup(UNUSED_ATTR void* context) { 
  std::lock_guard<std::recursive_timed_mutex> lock(

      commands_pending_response_mutex);

  alarm_cancel(startup_timer);

  if (!startup_future) {

    return;

  }

  future_ready(startup_future, FUTURE_SUCCESS);

  startup_future = NULL;

}
@@ -358,9 +361,11 @@ static void startup_timer_expired(UNUSED_ATTR void* context) { 
    // hence abort.

    abort();

  }

  if (!startup_future) {

    return;

  }

  future_ready(startup_future, FUTURE_FAIL);

  startup_future = NULL;

  lock.unlock();

}



// Command/packet transmitting functions