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

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

Merge "LC3: Avoid potential null dereference" am: 506ed817 

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

Change-Id: I5f79b0f981fac7ea97176fbacfe3f457e1d68c28
parents 54968af6 506ed817

system/embdrv/lc3/src/lc3.c

+3 −3
Original line number Diff line number Diff line
@@ -290,9 +290,6 @@ struct lc3_encoder *lc3_setup_encoder(int dt_us, int sr_hz, void *mem) 
int lc3_encode(struct lc3_encoder *encoder,

    const int16_t *pcm, int pitch, int nbytes, void *out)

{

    struct side_data side;

    int16_t xq[LC3_NE(encoder->dt, encoder->sr)];



    /* --- Check parameters --- */



    if (!encoder || nbytes < LC3_MIN_FRAME_BYTES
@@ -301,6 +298,9 @@ int lc3_encode(struct lc3_encoder *encoder, 


    /* --- Processing --- */



    struct side_data side;

    int16_t xq[LC3_NE(encoder->dt, encoder->sr)];



    load_s16(encoder, pcm, pitch);



    analyze(encoder, nbytes, &side, xq);