bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix process_injected_command undefined behavior (#14602)

Browse Source
This commit is contained in:
Marcio Teixeira
2019-07-14 09:12:48 -06:00
committed by Scott Lahteine
parent e139c1d9d9
commit cbe4bf2ba8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/gcode/queue.cpp
View File

@@ -170,16 +170,19 @@ bool GCodeQueue::process_injected_command() {
char c; char c;
size_t i = 0; size_t i = 0;
while ((c = pgm_read_byte(&injected_commands_P[i])) && c != '\n') i++; while ((c = pgm_read_byte(&injected_commands_P[i])) && c != '\n') i++;
if (i) {
// Extract current command and move pointer to next command
char cmd[i + 1]; char cmd[i + 1];
memcpy_P(cmd, injected_commands_P, i); memcpy_P(cmd, injected_commands_P, i);
cmd[i] = '\0'; cmd[i] = '\0';
injected_commands_P = c ? injected_commands_P + i + 1 : nullptr;
// Execute command if non-blank
if (i) {
parser.parse(cmd); parser.parse(cmd);
PORT_REDIRECT(SERIAL_PORT); PORT_REDIRECT(SERIAL_PORT);
gcode.process_parsed_command(); gcode.process_parsed_command();
} }
injected_commands_P = c ? injected_commands_P + i + 1 : nullptr;
return true; return true;
} }