Compare commits
No commits in common. "7af7c7f95df43a9686c9d7f4df11cd06c52ae14f" and "5b0dea4cd7146c745dd39854cdaac8430fabffbe" have entirely different histories.
7af7c7f95d
...
5b0dea4cd7
@ -5,7 +5,6 @@
|
||||
* over BLE.
|
||||
* @version 0.1
|
||||
* @date 2023-04-05
|
||||
* Updated : 2023-10-15, fixed potential memory leak.
|
||||
*
|
||||
* @copyright MIT
|
||||
*
|
||||
@ -255,10 +254,6 @@ gadget_bridge_parser_code_e gadget_bridge_parser_run(void)
|
||||
switch(_gadget_bridge_internals.gadget_bridge_parser_fsm)
|
||||
{
|
||||
case GADGET_BRIDGE_PARSER_FSM_NEW_MESSAGE:
|
||||
|
||||
// To prevent a potential memory leak if the parser is fed with bad data
|
||||
_free_event_data();
|
||||
|
||||
if((start = strstr(_gadget_bridge_internals.buffer, "setTime("))
|
||||
&& (end = strstr(_gadget_bridge_internals.buffer, ");")))
|
||||
{
|
||||
@ -1506,24 +1501,29 @@ static void _free_event_data(void)
|
||||
{
|
||||
case GADGET_BRIDGE_EVENT_TYPE_NOTIFY:
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.notification.title);
|
||||
_gadget_bridge_internals.event_data.notification.title = NULL;
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.notification.body);
|
||||
_gadget_bridge_internals.event_data.notification.body = NULL;
|
||||
break;
|
||||
case GADGET_BRIDGE_EVENT_TYPE_CALL:
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.call.phone_number);
|
||||
_gadget_bridge_internals.event_data.call.phone_number = NULL;
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.call.contact);
|
||||
_gadget_bridge_internals.event_data.call.contact = NULL;
|
||||
break;
|
||||
case GADGET_BRIDGE_EVENT_TYPE_WEATHER:
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.weather.location);
|
||||
_gadget_bridge_internals.event_data.weather.location = NULL;
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.weather.weather_desc);
|
||||
_gadget_bridge_internals.event_data.weather.weather_desc = NULL;
|
||||
break;
|
||||
case GADGET_BRIDGE_EVENT_TYPE_MUSIC_INFO:
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.music_info.artist);
|
||||
_gadget_bridge_internals.event_data.music_info.artist = NULL;
|
||||
tls_mem_free(_gadget_bridge_internals.event_data.music_info.track);
|
||||
_gadget_bridge_internals.event_data.music_info.track = NULL;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
break;
|
||||
}
|
||||
// Since we freed any potential event, set the new type as none by setting all fields to 0
|
||||
// this also ensures that pointers are set to NULL.
|
||||
memset(&_gadget_bridge_internals.event_data, 0, sizeof _gadget_bridge_internals.event_data);
|
||||
}
|
||||
|
||||
@ -31,8 +31,8 @@ static const WatchSettings_t defaultWatchSettings =
|
||||
.notification = {
|
||||
.notification_vibration_duration = 3,
|
||||
.notification_vibration_strength = 6,
|
||||
.notification_vibrate_on_notification_receive = true,
|
||||
.notification_vibrate_on_call_receive = true,
|
||||
.notification_vibrate_on_email = true,
|
||||
.notification_vibrate_on_sms = true,
|
||||
},
|
||||
.connectivity = {
|
||||
.connectivity_ble_enabled = false,
|
||||
|
||||
@ -51,8 +51,8 @@ typedef struct Activity
|
||||
*/
|
||||
typedef struct Notification
|
||||
{
|
||||
uint32_t notification_vibrate_on_notification_receive:1,
|
||||
notification_vibrate_on_call_receive:1,
|
||||
uint32_t notification_vibrate_on_sms:1,
|
||||
notification_vibrate_on_email:1,
|
||||
notification_vibration_strength:3,
|
||||
notification_vibration_duration:3;
|
||||
} Notification_t;
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
* over BLE.
|
||||
* @version 0.1
|
||||
* @date 2023-04-05
|
||||
* Updated : 2023-10-15, fixed potential memory leak.
|
||||
*
|
||||
* @copyright MIT
|
||||
*
|
||||
@ -15,7 +14,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
//#include "ble_service.h"
|
||||
|
||||
bool ble_service_send_nus_data(const uint8_t *data, uint16_t length)
|
||||
@ -251,10 +249,6 @@ gadget_bridge_parser_code_e gadget_bridge_parser_run(void)
|
||||
switch(_gadget_bridge_internals.gadget_bridge_parser_fsm)
|
||||
{
|
||||
case GADGET_BRIDGE_PARSER_FSM_NEW_MESSAGE:
|
||||
|
||||
// To prevent a potential memory leak if the parser is fed with bad data
|
||||
_free_event_data();
|
||||
|
||||
if((start = strstr(_gadget_bridge_internals.buffer, "setTime("))
|
||||
&& (end = strstr(_gadget_bridge_internals.buffer, ");")))
|
||||
{
|
||||
@ -1499,24 +1493,29 @@ static void _free_event_data(void)
|
||||
{
|
||||
case GADGET_BRIDGE_EVENT_TYPE_NOTIFY:
|
||||
free(_gadget_bridge_internals.event_data.notification.title);
|
||||
_gadget_bridge_internals.event_data.notification.title = NULL;
|
||||
free(_gadget_bridge_internals.event_data.notification.body);
|
||||
_gadget_bridge_internals.event_data.notification.body = NULL;
|
||||
break;
|
||||
case GADGET_BRIDGE_EVENT_TYPE_CALL:
|
||||
free(_gadget_bridge_internals.event_data.call.phone_number);
|
||||
_gadget_bridge_internals.event_data.call.phone_number = NULL;
|
||||
free(_gadget_bridge_internals.event_data.call.contact);
|
||||
_gadget_bridge_internals.event_data.call.contact = NULL;
|
||||
break;
|
||||
case GADGET_BRIDGE_EVENT_TYPE_WEATHER:
|
||||
free(_gadget_bridge_internals.event_data.weather.location);
|
||||
_gadget_bridge_internals.event_data.weather.location = NULL;
|
||||
free(_gadget_bridge_internals.event_data.weather.weather_desc);
|
||||
_gadget_bridge_internals.event_data.weather.weather_desc = NULL;
|
||||
break;
|
||||
case GADGET_BRIDGE_EVENT_TYPE_MUSIC_INFO:
|
||||
free(_gadget_bridge_internals.event_data.music_info.artist);
|
||||
_gadget_bridge_internals.event_data.music_info.artist = NULL;
|
||||
free(_gadget_bridge_internals.event_data.music_info.track);
|
||||
_gadget_bridge_internals.event_data.music_info.track = NULL;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
break;
|
||||
}
|
||||
// Since we freed any potential event, set the new type as none by setting all fields to 0
|
||||
// this also ensures that pointers are set to NULL.
|
||||
memset(&_gadget_bridge_internals.event_data, 0, sizeof _gadget_bridge_internals.event_data);
|
||||
}
|
||||
|
||||
@ -16,18 +16,18 @@
|
||||
<stdbool.h>
|
||||
<time.h>
|
||||
|
||||
1697318967 source:d:\users\think\programmation\arduino\git_projects\w800_smart_watch\src\gadget_bridge_parser\gadget_bridge.c
|
||||
1684074204 source:d:\users\think\programmation\arduino\git_projects\w800_smart_watch\src\gadget_bridge_parser\gadget_bridge.c
|
||||
"gadget_bridge.h"
|
||||
<stdio.h>
|
||||
<stdlib.h>
|
||||
<string.h>
|
||||
|
||||
1684086410 d:\users\think\programmation\arduino\git_projects\w800_smart_watch\src\gadget_bridge_parser\gadget_bridge.h
|
||||
1684074112 d:\users\think\programmation\arduino\git_projects\w800_smart_watch\src\gadget_bridge_parser\gadget_bridge.h
|
||||
<stdint.h>
|
||||
<stdbool.h>
|
||||
<time.h>
|
||||
|
||||
1697358815 source:d:\users\think\programmation\arduino\git_projects\w800_smart_watch\src\gadget_bridge_parser\main.c
|
||||
1684074076 source:d:\users\think\programmation\arduino\git_projects\w800_smart_watch\src\gadget_bridge_parser\main.c
|
||||
<stdio.h>
|
||||
<stdlib.h>
|
||||
<string.h>
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="gadget_bridge.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="main.c" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="4496" topLine="288" />
|
||||
<Cursor1 position="11119" topLine="337" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gadget_bridge.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="gadget_bridge.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="71209" topLine="1490" />
|
||||
<Cursor1 position="4063" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.c" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="gadget_bridge.c" open="1" top="1" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="11686" topLine="156" />
|
||||
<Cursor1 position="2213" topLine="94" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
||||
@ -320,10 +320,6 @@ const char *sample[] =
|
||||
"ith a very long content ",
|
||||
"to make sure this case i",
|
||||
"s handled in the parser ",
|
||||
|
||||
// Let's simulate bad data to check for robustness
|
||||
"[16]GB({t:\"notify\",id:",
|
||||
|
||||
"and we do not crash the ",
|
||||
"thing because we forgot ",
|
||||
"to handle such a case, d",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user