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

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

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-dr1-dev 

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: bb8ae44e
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act
parents aeba781a ec030aa5

system/bta/hh/bta_hh_act.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 




#if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)

#if defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)





#include <log/log.h>

#include <string.h>

#include <string.h>





#include "bta_sys.h"

#include "bta_sys.h"
@@ -764,6 +765,12 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data) 
    APPL_TRACE_DEBUG("Ctrl DATA received w4: event[%s]",

    APPL_TRACE_DEBUG("Ctrl DATA received w4: event[%s]",

                        bta_hh_get_w4_event(p_cb->w4_evt));

                        bta_hh_get_w4_event(p_cb->w4_evt));

#endif

#endif

    if (pdata->len == 0) {

        android_errorWriteLog(0x534e4554, "116108738");

        p_cb->w4_evt = 0;

        osi_free_and_reset((void**)&pdata);

        return;

    }

    hs_data.status  = BTA_HH_OK;

    hs_data.status  = BTA_HH_OK;

    hs_data.handle  = p_cb->hid_handle;

    hs_data.handle  = p_cb->hid_handle;