zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Log: fixed a bug where we could index outside an array 

when we first start up, num_existing_logs may be zero
master
Andrew Tridgell 13 years ago
parent
da800a295f
commit
ae1e1c940f
2 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ArduCopter/Log.pde
  2. 3
      ArduPlane/Log.pde

3
ArduCopter/Log.pde
Unescape View File

@ -260,7 +260,8 @@ static void start_new_log() @@ -260,7 +260,8 @@ static void start_new_log()
end_pages[num_existing_logs - 1] = find_last_log_page(start_pages[num_existing_logs - 1]);
}
if((end_pages[num_existing_logs - 1] < 4095) && (num_existing_logs < MAX_NUM_LOGS /*50*/)) {
if(num_existing_logs == 0 ||
((end_pages[num_existing_logs - 1] < 4095) && (num_existing_logs < MAX_NUM_LOGS /*50*/))) {
if(num_existing_logs > 0)
start_pages[num_existing_logs] = end_pages[num_existing_logs - 1] + 1;

3
ArduPlane/Log.pde
Unescape View File

@ -243,7 +243,8 @@ static void start_new_log(byte num_existing_logs) @@ -243,7 +243,8 @@ static void start_new_log(byte num_existing_logs)
end_pages[num_existing_logs - 1] = find_last_log_page(start_pages[num_existing_logs - 1]);
}
if(end_pages[num_existing_logs - 1] < 4095 && num_existing_logs < MAX_NUM_LOGS) {
if(num_existing_logs == 0 ||
(end_pages[num_existing_logs - 1] < 4095 && num_existing_logs < MAX_NUM_LOGS)) {
if(num_existing_logs > 0)
start_pages[num_existing_logs] = end_pages[num_existing_logs - 1] + 1;
else

Write Preview
Loading…
Cancel
Save