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

Commit b04436f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "liblc3_fuzzer: Pass proper size of input data for 24bit encoder tests"... 

Merge "liblc3_fuzzer: Pass proper size of input data for 24bit encoder tests" am: 3e56cc31 am: 7a474087 am: 160c3b90 am: 58a829f1

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



Change-Id: I484e79ac0bb2f0a3f671ecfd041be71a75e56563
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b019a136 58a829f1

system/embdrv/lc3/fuzzer/liblc3_fuzzer.cpp

+7 −5
Original line number Original line Diff line number Diff line
@@ -26,14 +26,15 @@ void TestEncoder(FuzzedDataProvider& fdp) { 
  unsigned enc_size = lc3_encoder_size(dt_us, sr_hz);

  unsigned enc_size = lc3_encoder_size(dt_us, sr_hz);

  uint16_t output_byte_count = fdp.ConsumeIntegralInRange(20, 400);

  uint16_t output_byte_count = fdp.ConsumeIntegralInRange(20, 400);

  uint16_t num_frames = lc3_frame_samples(dt_us, sr_hz);

  uint16_t num_frames = lc3_frame_samples(dt_us, sr_hz);

  uint8_t bytes_per_frame = (pcm_format == LC3_PCM_FORMAT_S16 ? 2 : 4);





  if (fdp.remaining_bytes() < num_frames * 2) {

  if (fdp.remaining_bytes() < num_frames * bytes_per_frame) {

    return;

    return;

  }

  }





  std::vector<uint16_t> input_frames(num_frames);

  std::vector<uint32_t> input_frames(

  fdp.ConsumeData(input_frames.data(),

      num_frames / (pcm_format == LC3_PCM_FORMAT_S16 ? 2 : 1));

                  input_frames.size() * 2 /* each frame is 2 bytes */);

  fdp.ConsumeData(input_frames.data(), num_frames * bytes_per_frame);





  void* lc3_encoder_mem = nullptr;

  void* lc3_encoder_mem = nullptr;

  lc3_encoder_mem = malloc(enc_size);

  lc3_encoder_mem = malloc(enc_size);
@@ -71,7 +72,8 @@ void TestDecoder(FuzzedDataProvider& fdp) { 
  lc3_decoder_t lc3_decoder =

  lc3_decoder_t lc3_decoder =

      lc3_setup_decoder(dt_us, sr_hz, 0, lc3_decoder_mem);

      lc3_setup_decoder(dt_us, sr_hz, 0, lc3_decoder_mem);





  std::vector<uint16_t> output(num_frames);

  std::vector<uint32_t> output(num_frames /

                               (pcm_format == LC3_PCM_FORMAT_S16 ? 2 : 1));

  lc3_decode(lc3_decoder, input.data(), input.size(), pcm_format,

  lc3_decode(lc3_decoder, input.data(), input.size(), pcm_format,

             (int16_t*)output.data(), 1);

             (int16_t*)output.data(), 1);