Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stepcompress: Fix error causing queue to not be expanded in expand_queue() 

The test to check if the queue only needed to be moved was not correct
and it could lead to a segfault if clean_queue() was called instead of
actually increasing the queue size.

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

4
klippy/stepcompress.c
View File

@ -59,11 +59,11 @@ clean_queue(struct stepcompress *sc)
static void static void
expand_queue(struct stepcompress *sc, int count) expand_queue(struct stepcompress *sc, int count)
{ {
if (sc->queue + count <= sc->queue_end) { int alloc = sc->queue_end - sc->queue;
if (count + sc->queue_next - sc->queue_pos <= alloc) {
clean_queue(sc); clean_queue(sc);
return; return;
} }
int alloc = sc->queue_end - sc->queue;
int pos = sc->queue_pos - sc->queue; int pos = sc->queue_pos - sc->queue;
int next = sc->queue_next - sc->queue; int next = sc->queue_next - sc->queue;
if (!alloc) if (!alloc)