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

Commit 23a4cc95 authored by VenkatRaghavan VijayaRaghavan's avatar VenkatRaghavan VijayaRaghavan Committed by Andre Eisenbach
Browse files

Prevent Memory overbound and initialize variables 

1. Fix for initializing all the un-initialized variables
2. Potential strncpy overbound

Bug: 19417758
parent f8a41c3a

system/btif/src/btif_dm.c

+3 −1
Original line number Diff line number Diff line
@@ -2503,7 +2503,9 @@ bt_status_t btif_dm_get_adapter_property(bt_property_t *prop) 
        case BT_PROPERTY_BDNAME:

        {

            bt_bdname_t *bd_name = (bt_bdname_t*)prop->val;

            strcpy((char *)bd_name->name, btif_get_default_local_name());

            strncpy((char *)bd_name->name,btif_get_default_local_name(),

                   sizeof(bd_name->name) - 1);

            bd_name->name[sizeof(bd_name->name) - 1] = 0;

            prop->len = strlen((char *)bd_name->name);

        }

        break;

system/btif/src/btif_hl.c

+2 −2
Original line number Diff line number Diff line
@@ -1840,8 +1840,8 @@ BOOLEAN btif_hl_find_app_idx_using_deleted_mdl_id( UINT8 mdl_id, 
    {

        p_acb =BTIF_HL_GET_APP_CB_PTR(i);

        if (p_acb->delete_mdl.active) {

            BTIF_TRACE_DEBUG("btif_hl_find_app_idx_using_deleted_mdl_id: app_idx=%d,"

                              "mdl_id=%d mcl_handle=%d",i,mdl_id,p_acb->mcb[i].mcl_handle);

            BTIF_TRACE_DEBUG("%s: app_idx=%d, mdl_id=%d",

                             __FUNCTION__,i,mdl_id);

        }

        if (p_acb->delete_mdl.active &&

            (p_acb->delete_mdl.mdl_id == mdl_id))