Add protection against deref of NULL set

Author: aiden-ct

customer_app/bl602_demo_event/bl602_demo_event/ble.c

@@ -69,7 +69,7 @@
 #if defined(CONFIG_BT_WIFIPROV_SERVER)
 static void wifiprov_connect_ap_ind(void)
 {
-    printf("Recevied indication to connect to AP\r\n");    
+    printf("Recevied indication to connect to AP\r\n");
     wifi_prov_api_event_trigger_connect();
 }
 
@@ -87,7 +87,7 @@ static void wifiprov_ssid_ind(void *buf,size_t size)
 
 static void wifiprov_bssid_ind(void *buf,size_t size)
 {
-    
+
     printf("Recevied bssid: %s \r\n", bt_hex(buf, size));
 }
 
@@ -115,7 +115,7 @@ struct conn_callback WifiProv_conn_callback = {
 
 void model_gen_cb(uint8_t value)
 {
-    bl_gpio_output_set(LED_PIN, value); 
+    bl_gpio_output_set(LED_PIN, value);
 }
 
 #if defined(CONFIG_BT_MESH_MODEL)
@@ -132,6 +132,9 @@ static void example_handle_gen_onoff_msg(bfl_ble_mesh_model_t *model,
 		break;
 	case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET:
 	case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET_UNACK:
+		if (!set) {
+			break;
+		}
 		if (set->op_en == false) {
 			srv->state.onoff = set->onoff;
 		} else {
@@ -209,6 +212,9 @@ static void example_handle_light_lgn_msg(bfl_ble_mesh_model_t *model,
 		break;
 	case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET:
 	case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK:
+		if (!set) {
+			break;
+		}
 		if (set->op_en == false) {
 			srv->state->lightness_actual = set->lightness;
 		} else {
@@ -243,14 +249,14 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
         }
 		else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
             param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET_UNACK) {
-            printf("Light ctl ln[%x]tp[%x]uv[%x]\n", 
+            printf("Light ctl ln[%x]tp[%x]uv[%x]\n",
 				param->value.state_change.ctl_set.lightness,
 				param->value.state_change.ctl_set.temperature,
 				param->value.state_change.ctl_set.delta_uv);
         }
 		else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
 	        param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
-	        printf("Light hsl l[%x]h[%x]s[%x]\n", 
+	        printf("Light hsl l[%x]h[%x]s[%x]\n",
 				param->value.state_change.hsl_set.lightness,
 				param->value.state_change.hsl_set.hue,
 				param->value.state_change.hsl_set.saturation);
@@ -265,15 +271,15 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
         }
 		else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_GET) {
             bfl_ble_mesh_light_ctl_srv_t *srv = param->model->user_data;
-            printf("Light ctl ln[%x]ln_t[%x] tp[%x]tp_t[%x] uv[%x]uv_t[%x]\n", 
+            printf("Light ctl ln[%x]ln_t[%x] tp[%x]tp_t[%x] uv[%x]uv_t[%x]\n",
             		srv->state->lightness, srv->state->target_lightness,
             		srv->state->temperature, srv->state->target_temperature,
             		srv->state->delta_uv, srv->state->target_delta_uv);
             //example_handle_gen_onoff_msg(param->model, &param->ctx, NULL);
         }
 		else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_GET) {
             bfl_ble_mesh_light_hsl_srv_t *srv = param->model->user_data;
-            printf("Light ctl l[%x]l_t[%x] h[%x]h_t[%x] s[%x]s_t[%x]\n", 
+            printf("Light ctl l[%x]l_t[%x] h[%x]h_t[%x] s[%x]s_t[%x]\n",
             		srv->state->lightness, srv->state->target_lightness,
             		srv->state->hue, srv->state->target_hue,
             		srv->state->saturation, srv->state->target_saturation);
@@ -293,7 +299,7 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
         }
 		else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
             param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET_UNACK) {
-            printf("Light ctl ln[%x] tp[%d] uv[%x] tid[%x]\n", 
+            printf("Light ctl ln[%x] tp[%d] uv[%x] tid[%x]\n",
 				param->value.set.ctl.lightness,
 				param->value.set.ctl.temperature,
 				param->value.set.ctl.delta_uv,
@@ -306,7 +312,7 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
         }
 		else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
             param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
-            printf("Light hsl l[%x] h[%d] s[%x] tid[%x]\n", 
+            printf("Light hsl l[%x] h[%d] s[%x] tid[%x]\n",
 				param->value.set.hsl.lightness,
 				param->value.set.hsl.hue,
 				param->value.set.hsl.saturation,
@@ -330,7 +336,7 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
 #ifndef CONFIG_BT_TL
 void bt_enable_cb(int err)
 {
-    if (!err) {     
+    if (!err) {
         ble_cli_register();
 #if defined(CONFIG_BT_STACK_PTS)
         pts_cli_register();
@@ -340,7 +346,7 @@ void bt_enable_cb(int err)
         blemesh_cli_register();
 #if defined(CONFIG_BT_MESH_MODEL)
 #if defined(CONFIG_BT_MESH_MODEL_GEN_SRV)
-        bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);	
+        bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
 		bfl_ble_mesh_register_generic_server_callback(example_ble_mesh_generic_server_cb);
 #endif
 #if defined(CONFIG_BT_MESH_MODEL_LIGHT_SRV)