3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stepcompress: Check for invalid count in step_factor and step_sqrt 

Check for an invalid count and report an error if found.  This
prevents some segfaults when count goes negative.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2016-07-13 14:47:03 -04:00
parent af99ab1645
commit 3fa7da804d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
klippy/stepcompress.c
View File

@ -280,6 +280,11 @@ stepcompress_push_factor(struct stepcompress *sc
double ceil_steps = ceil(steps - step_offset); double ceil_steps = ceil(steps - step_offset);
double next_step_offset = ceil_steps - (steps - step_offset); double next_step_offset = ceil_steps - (steps - step_offset);
int count = ceil_steps; int count = ceil_steps;
if (count < 0 || count > 1000000) {
fprintf(stderr, "ERROR: push_factor invalid count %d %f %f %f %f\n"
, sc->oid, steps, step_offset, clock_offset, factor);
return next_step_offset;
}
check_expand(sc, count); check_expand(sc, count);
// Calculate each step time // Calculate each step time
@ -304,6 +309,12 @@ stepcompress_push_sqrt(struct stepcompress *sc, double steps, double step_offset
double ceil_steps = ceil(steps - step_offset); double ceil_steps = ceil(steps - step_offset);
double next_step_offset = ceil_steps - (steps - step_offset); double next_step_offset = ceil_steps - (steps - step_offset);
int count = ceil_steps; int count = ceil_steps;
if (count < 0 || count > 1000000) {
fprintf(stderr, "ERROR: push_sqrt invalid count %d %f %f %f %f %f\n"
, sc->oid, steps, step_offset, clock_offset, sqrt_offset
, factor);
return next_step_offset;
}
check_expand(sc, count); check_expand(sc, count);
// Calculate each step time // Calculate each step time
@ -320,7 +331,7 @@ stepcompress_push_sqrt(struct stepcompress *sc, double steps, double step_offset
*qn++ = clock_offset - sqrt(pos*factor); *qn++ = clock_offset - sqrt(pos*factor);
pos += 1.0; pos += 1.0;
} }
sc->queue_next = end; sc->queue_next = qn;
return next_step_offset; return next_step_offset;
} }
@ -405,7 +416,7 @@ struct steppersync {
int num_move_clocks; int num_move_clocks;
}; };
// Allocate a new 'stepperysync' object // Allocate a new 'steppersync' object
struct steppersync * struct steppersync *
steppersync_alloc(struct serialqueue *sq, struct stepcompress **sc_list steppersync_alloc(struct serialqueue *sq, struct stepcompress **sc_list
, int sc_num, int move_num) , int sc_num, int move_num)