Fix crash due to invalid timespec given to pselect

[st.git] / st.c

diff --git a/st.c b/st.c
index 4499be6..db9a332 100644 (file)
--- a/st.c
+++ b/st.c
@@ -947,6 +947,8 @@ getsel(void) {
                        lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
                }
                last = &term.line[y][MIN(lastx, linelen-1)];
                        lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
                }
                last = &term.line[y][MIN(lastx, linelen-1)];

+               while(last >= gp && last->c[0] == ' ')
+                       --last;

 
                for( ; gp <= last; ++gp) {
                        if(gp->mode & ATTR_WDUMMY)
 
                for( ; gp <= last; ++gp) {
                        if(gp->mode & ATTR_WDUMMY)


@@ -3920,6 +3922,9 @@ run(void) {
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }

+                                       drawtimeout.tv_sec = \
+                                           drawtimeout.tv_nsec / 1E9;
+                                       drawtimeout.tv_nsec %= (long)1E9;

                                } else {
                                        tv = NULL;
                                }
                                } else {
                                        tv = NULL;
                                }