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

Commit fdbeff79 authored by Greg Kaiser's avatar Greg Kaiser Committed by Automerger Merge Worker
Browse files

Avoid null pointer dereference am: ee3b08f2 am: 219561fb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2015376

Change-Id: I6f1245a4d53c459880ccc2db1a7c117cede5cf1d
parents c4a06948 219561fb
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -2310,9 +2310,10 @@ class LeAudioClientImpl : public LeAudioClient {
          LeAudioClientAudioSink::SendData((uint8_t*)left->data(), to_write);
    } else if (!bt_got_stereo && af_is_stereo) {
      /* mono audio over bluetooth, audio framework expects stereo */
      std::vector<uint16_t> mixed(left ? left->size() * 2 : right->size() * 2);
      const size_t mono_size = left ? left->size() : right->size();
      std::vector<uint16_t> mixed(mono_size * 2);

      for (size_t i = 0; i < left->size(); i++) {
      for (size_t i = 0; i < mono_size; i++) {
        mixed[2 * i] = left ? (*left)[i] : 0;
        mixed[2 * i + 1] = right ? (*right)[i] : 0;
      }