Fixing an out-of-bound bug in the selection code. Thanks Szabolczs Nagy! - st - Personal fork of st
 (HTM) git clone git://git.drkhsh.at/st.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit abe85c0e997ed1882c69bde511f7e2746f68d9ab
 (DIR) parent 091ae143ce09e930fd61dae15f8d613c7eab5a61
 (HTM) Author: Christoph Lohmann <20h@r-36.net>
       Date:   Sat,  3 Nov 2012 03:24:22 +0100
       
       Fixing an out-of-bound bug in the selection code. Thanks Szabolczs Nagy!
       
       Diffstat:
         M config.def.h                        |       2 +-
         M st.c                                |      31 +++++++++++++++++++++++--------
       
       2 files changed, 24 insertions(+), 9 deletions(-)
       ---
 (DIR) diff --git a/config.def.h b/config.def.h
       @@ -2,7 +2,7 @@
        
        /* appearance */
        static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
       -static unsigned int borderpx = 2;
       +static int borderpx = 2;
        static char shell[] = "/bin/sh";
        
        /* double-click timeout (in milliseconds) between clicks for selection */
 (DIR) diff --git a/st.c b/st.c
       @@ -72,8 +72,6 @@
        #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
        #define IS_SET(flag) (term.mode & (flag))
        #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
       -#define X2COL(x) (((x) - borderpx)/xw.cw)
       -#define Y2ROW(y) (((y) - borderpx)/xw.ch)
        
        #define VT102ID "\033[?6c"
        
       @@ -582,6 +580,22 @@ selinit(void) {
                        sel.xtarget = XA_STRING;
        }
        
       +static int
       +x2col(int x) {
       +        x -= borderpx;
       +        x /= xw.cw;
       +
       +        return LIMIT(x, 0, term.col-1);
       +}
       +
       +static int
       +y2row(int y) {
       +        y -= borderpx;
       +        y /= xw.ch;
       +
       +        return LIMIT(y, 0, term.row-1);
       +}
       +
        static inline bool
        selected(int x, int y) {
                int bx, ex;
       @@ -603,8 +617,9 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
                if(b)
                        *b = e->xbutton.button;
        
       -        *x = X2COL(e->xbutton.x);
       -        *y = Y2ROW(e->xbutton.y);
       +        *x = x2col(e->xbutton.x);
       +        *y = y2row(e->xbutton.y);
       +
                sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
                sel.b.y = MIN(sel.by, sel.ey);
                sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
       @@ -613,8 +628,8 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
        
        void
        mousereport(XEvent *e) {
       -        int x = X2COL(e->xbutton.x);
       -        int y = Y2ROW(e->xbutton.y);
       +        int x = x2col(e->xbutton.x);
       +        int y = y2row(e->xbutton.y);
                int button = e->xbutton.button;
                int state = e->xbutton.state;
                char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
       @@ -656,8 +671,8 @@ bpress(XEvent *e) {
                                draw();
                        }
                        sel.mode = 1;
       -                sel.ex = sel.bx = X2COL(e->xbutton.x);
       -                sel.ey = sel.by = Y2ROW(e->xbutton.y);
       +                sel.ex = sel.bx = x2col(e->xbutton.x);
       +                sel.ey = sel.by = y2row(e->xbutton.y);
                }
        }