melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3184 from thinkyhead/fix_command_injection

Browse Source 
Patch drain_queued_commands_P
This commit is contained in:
Scott Lahteine 2016-03-19 20:12:16 -07:00
commit da94bcfebb
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/Marlin_main.cpp
View File

@ -491,23 +491,20 @@ extern "C" {
*/
static bool drain_queued_commands_P() {
if (queued_commands_P != NULL) {
// Get the next gcode to run
size_t i = 0;
char c;
while ((c = queued_commands_P[i++]) && c != '\n') { };
if (i > 1) {
char cmd[i];
strncpy_P(cmd, queued_commands_P, i - 1);
cmd[i - 1] = '\0';
if (enqueue_and_echo_command(cmd)) { // buffer was not full (else we will retry later)
if (c)
queued_commands_P += i; // move to next command
char c, cmd[30];
strncpy_P(cmd, queued_commands_P, sizeof(cmd) - 1);
cmd[sizeof(cmd) - 1] = '\0';
while ((c = cmd[i]) && c != '\n') i++; // find the end of this gcode command
cmd[i] = '\0';
if (enqueue_and_echo_command(cmd)) { // success?
if (c) // newline char?
queued_commands_P += i + 1; // advance to the next command
else
queued_commands_P = NULL; // no more commands in the sequence
queued_commands_P = NULL; // nul char? no more commands
}
}
}
return (queued_commands_P != NULL); // any more left to add?
return (queued_commands_P != NULL); // return whether any more remain
}
/**