Some minor bug fixes (prevent crashes in dana and upon quit)

diff --git a/mw_main.c b/mw_main.c
index af499c64d6a3fa3b5307b8aca91a16efbfec7c8d..3da85419a398dc902b4796f2350d7ddf88036a54 100644 (file)
--- a/mw_main.c
+++ b/mw_main.c
@@ -563,14 +563,16 @@ static int separate_params(char *params[], char *pbuf)
 static void params_free(char **params)
 {
        int i;
+
        for (i=0; i < PARAMS_MAX; i++)
-               free(params[i]);
+               if (params[i] != NULL)
+                       free(params[i]);
 }
 
 void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
 {
        unsigned char mdata[32];
-       unsigned int intopt;
+       unsigned int intopt=0;
        char cmd[128], pbuf[128], *params[PARAMS_MAX];
        int i, pcnt;
        char *inbuf = cmdline;
@@ -602,11 +604,9 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
                pcnt = 0;
 
        if (strncmp(cmd, "quit", 4) == 0) {
-               //close(mw_fd);
-               //exit(0);
                /* just in case we quit and show another screen */
                mw_update_display(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0);
-               params_free(params);
+               // params_free(params);
                g_main_loop_quit (mwdata->mloop);
        }
        if (strncmp(cmd, "help", 4) == 0) {

diff --git a/mw_utility.c b/mw_utility.c
index 6d7ab8aac41ffde2eebd25e8310dec0136510654..fa7d3420b5f089c6f9973b570266dead9e0324c6 100644 (file)
--- a/mw_utility.c
+++ b/mw_utility.c
@@ -155,6 +155,9 @@ void mw_buf_draw_pixel(mw_buffer *mwbuf, unsigned int x, unsigned int y, mw_colo
        if (clr == MW_TRANSPARENT)
                return;
 
+       if (x < 0 || x > 128 || y < 0 || y > 128)
+               return;
+
        *(unsigned char *)(mwbuf->pbuf+((y*mwbuf->res_x)+x)) = clr;
 }