sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trace: fix pointer cross the border

Browse Source 
Fix pointer cross the border

Signed-off-by: zhuyanlin <zhuyanlin1@xiaomi.com>
This commit is contained in:
zhuyanlin 2022-03-25 14:13:09 +08:00 committed by Xiang Xiao
parent d868387148
commit e3df21cd4c
1 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
system/trace/trace.c
View File

@ -485,29 +485,32 @@ static int trace_cmd_switch(int index, int argc, FAR char **argv,
/* Parse the setting parameters */ /* Parse the setting parameters */
if (argv[index][0] == '-' || argv[index][0] == '+') if (index < argc)
{ {
enable = (argv[index][0] == '+'); if (argv[index][0] == '-' || argv[index][0] == '+')
if (enable ==
((mode.flag & NOTE_FILTER_MODE_FLAG_SWITCH) != 0))
{ {
/* Already set */ enable = (argv[index][0] == '+');
if (enable ==
((mode.flag & NOTE_FILTER_MODE_FLAG_SWITCH) != 0))
{
/* Already set */
return false; return false;
}
if (enable)
{
mode.flag |= NOTE_FILTER_MODE_FLAG_SWITCH;
}
else
{
mode.flag &= ~NOTE_FILTER_MODE_FLAG_SWITCH;
}
ioctl(notectlfd, NOTECTL_SETMODE, (unsigned long)&mode);
index++;
} }
if (enable)
{
mode.flag |= NOTE_FILTER_MODE_FLAG_SWITCH;
}
else
{
mode.flag &= ~NOTE_FILTER_MODE_FLAG_SWITCH;
}
ioctl(notectlfd, NOTECTL_SETMODE, (unsigned long)&mode);
index++;
} }
return index; return index;
@ -735,29 +738,32 @@ static int trace_cmd_print(int index, int argc, FAR char **argv,
/* Parse the setting parameters */ /* Parse the setting parameters */
if (argv[index][0] == '-' || argv[index][0] == '+') if (index < argc)
{ {
enable = (argv[index][0] == '+'); if (argv[index][0] == '-' || argv[index][0] == '+')
if (enable ==
((mode.flag & NOTE_FILTER_MODE_FLAG_DUMP) != 0))
{ {
/* Already set */ enable = (argv[index][0] == '+');
if (enable ==
((mode.flag & NOTE_FILTER_MODE_FLAG_DUMP) != 0))
{
/* Already set */
return false; return false;
}
if (enable)
{
mode.flag |= NOTE_FILTER_MODE_FLAG_DUMP;
}
else
{
mode.flag &= ~NOTE_FILTER_MODE_FLAG_DUMP;
}
ioctl(notectlfd, NOTECTL_SETMODE, (unsigned long)&mode);
index++;
} }
if (enable)
{
mode.flag |= NOTE_FILTER_MODE_FLAG_DUMP;
}
else
{
mode.flag &= ~NOTE_FILTER_MODE_FLAG_DUMP;
}
ioctl(notectlfd, NOTECTL_SETMODE, (unsigned long)&mode);
index++;
} }
return index; return index;