CSIEscape, STREscape: use size_t for buffer length

[st.git] / st.c

diff --git a/st.c b/st.c
index 8e6ccb5..0c1acd4 100644 (file)
--- a/st.c
+++ b/st.c
@@ -135,7 +135,7 @@ typedef struct {
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */

-       int len;               /* raw string length */
+       size_t len;            /* raw string length */

        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */


@@ -147,7 +147,7 @@ typedef struct {
 typedef struct {
        char type;             /* ESC type ... */
        char buf[STR_BUF_SIZ]; /* raw string */
 typedef struct {
        char type;             /* ESC type ... */
        char buf[STR_BUF_SIZ]; /* raw string */

-       int len;               /* raw string length */
+       size_t len;            /* raw string length */

        char *args[STR_ARG_SIZ];
        int narg;              /* nb of args */
 } STREscape;
        char *args[STR_ARG_SIZ];
        int narg;              /* nb of args */
 } STREscape;


@@ -366,7 +366,7 @@ char
 base64dec_getc(const char **src)
 {
        while (**src && !isprint(**src)) (*src)++;
 base64dec_getc(const char **src)
 {
        while (**src && !isprint(**src)) (*src)++;

-       return *((*src)++);
+       return **src ? *((*src)++) : '=';  /* emulate padding if string ends */

 }
 
 char *
 }
 
 char *


@@ -384,6 +384,10 @@ base64dec(const char *src)
                int c = base64_digits[(unsigned char) base64dec_getc(&src)];
                int d = base64_digits[(unsigned char) base64dec_getc(&src)];
 
                int c = base64_digits[(unsigned char) base64dec_getc(&src)];
                int d = base64_digits[(unsigned char) base64dec_getc(&src)];
 

+               /* invalid input. 'a' can be -1, e.g. if src is "\n" (c-str) */
+               if (a == -1 || b == -1)
+                       break;
+

                *dst++ = (a << 2) | ((b & 0x30) >> 4);
                if (c == -1)
                        break;
                *dst++ = (a << 2) | ((b & 0x30) >> 4);
                if (c == -1)
                        break;


@@ -458,7 +462,7 @@ selextend(int col, int row, int type, int done)
        selnormalize();
        sel.type = type;
 
        selnormalize();
        sel.type = type;
 

-       if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
+       if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)

                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 
        sel.mode = done ? SEL_IDLE : SEL_READY;
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 
        sel.mode = done ? SEL_IDLE : SEL_READY;


@@ -1799,7 +1803,7 @@ csihandle(void)
 void
 csidump(void)
 {
 void
 csidump(void)
 {

-       int i;
+       size_t i;

        uint c;
 
        fprintf(stderr, "ESC[");
        uint c;
 
        fprintf(stderr, "ESC[");


@@ -1917,7 +1921,7 @@ strparse(void)
 void
 strdump(void)
 {
 void
 strdump(void)
 {

-       int i;
+       size_t i;

        uint c;
 
        fprintf(stderr, "ESC%c", strescseq.type);
        uint c;
 
        fprintf(stderr, "ESC%c", strescseq.type);


@@ -2326,7 +2330,7 @@ tputc(Rune u)
                if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
                        term.mode |= MODE_SIXEL;
 
                if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
                        term.mode |= MODE_SIXEL;
 

-               if (strescseq.len+len >= sizeof(strescseq.buf)-1) {
+               if (strescseq.len+len >= sizeof(strescseq.buf)) {

                        /*
                         * Here is a bug in terminals. If the user never sends
                         * some code to stop the str or esc command, then st
                        /*
                         * Here is a bug in terminals. If the user never sends
                         * some code to stop the str or esc command, then st