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

Commit a6920307 authored by Eric Laurent's avatar Eric Laurent
Browse files

sound trigger: fix array overflow in HAL wrapper 

Bug: 65383689
Test: make
Change-Id: I9d62eb9be096222bcc3e1734a21f6ade0005b180
parent 1a17e86d

soundtrigger/2.0/default/SoundTriggerHalImpl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -388,10 +388,12 @@ void SoundTriggerHalImpl::convertTriggerPhraseToHal( 
    halTriggerPhrase->id = triggerPhrase->id;

    halTriggerPhrase->recognition_mode = triggerPhrase->recognitionModes;

    unsigned int i;

    for (i = 0; i < triggerPhrase->users.size(); i++) {



    halTriggerPhrase->num_users =

        std::min((int)triggerPhrase->users.size(), SOUND_TRIGGER_MAX_USERS);

    for (i = 0; i < halTriggerPhrase->num_users; i++) {

        halTriggerPhrase->users[i] = triggerPhrase->users[i];

    }

    halTriggerPhrase->num_users = i;



    strlcpy(halTriggerPhrase->locale,

            triggerPhrase->locale.c_str(), SOUND_TRIGGER_MAX_LOCALE_LEN);