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

Commit 237acf48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "sound trigger: fix array overflow in HAL wrapper"

parents f9d362ef a6920307
Loading
Loading
Loading
Loading
+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);