From: Peter Howkins <flibble@users.sf.net>
Date: Wed, 28 Mar 2018 01:24:27 +0000 (+0100)
Subject: dtcalc: resolve coverity issues
X-Git-Tag: 2.2.4a~179
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f65f51298177e1c4530e09241f941f80bf98bcb2;p=oweals%2Fcde.git

dtcalc: resolve coverity issues
---

diff --git a/cde/programs/dtcalc/ds_xlib.c b/cde/programs/dtcalc/ds_xlib.c
index 76261907..2e13a0d2 100644
--- a/cde/programs/dtcalc/ds_xlib.c
+++ b/cde/programs/dtcalc/ds_xlib.c
@@ -95,14 +95,14 @@ ds_get_resource(XrmDatabase rDB, char *appname, char *resource)
   char *str_type[20] ;
   XrmValue value ;
 
-  STRCPY(app, appname) ;
-  STRCPY(res, resource) ;
+  snprintf(app, sizeof(app), "%s", appname) ;
+  snprintf(res, sizeof(res), "%s", resource) ;
   if (isupper(app[0])) app[0] = tolower(app[0]) ;
-  SPRINTF(nstr, "%s.%s", app, res) ;
+  snprintf(nstr, sizeof(nstr), "%s.%s", app, res) ;
 
   if (islower(res[0])) res[0] = toupper(res[0]) ;
   if (islower(app[0])) app[0] = toupper(app[0]) ;
-  SPRINTF(cstr, "%s.%s", app, res) ;
+  snprintf(cstr, sizeof(cstr), "%s.%s", app, res) ;
 
   if (XrmGetResource(rDB, nstr, cstr, str_type, &value) == 0)
     return((char *) NULL) ;
@@ -164,7 +164,7 @@ ds_load_resources(Display *display)
 
   if ((ptr = getenv("XENVIRONMENT")) == NULL)
     {
-      SPRINTF(name, "%s/.Xdefaults-", home) ;
+      snprintf(name, sizeof(name), "%s/.Xdefaults-", home) ;
       len = strlen(name) ;
       GETHOSTNAME(name+len, 1024-len) ;
       db = XrmGetFileDatabase(name) ;
@@ -211,9 +211,9 @@ ds_put_resource(XrmDatabase *rDB, char *appname, char *rstr, char *rval)
 {
   char app[MAXLINE], resource[MAXLINE] ;
 
-  STRCPY(app, appname) ;
+  snprintf(app, sizeof(app), "%s", appname) ;
   if (isupper(app[0])) app[0] = tolower(app[0]) ;
-  SPRINTF(resource, "%s.%s", app, rstr) ;
+  snprintf(resource, sizeof(resource), "%s.%s", app, rstr) ;
 
   XrmPutStringResource(rDB, resource, rval) ;
 }
diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c
index 7bcdf340..042af244 100644
--- a/cde/programs/dtcalc/motif.c
+++ b/cde/programs/dtcalc/motif.c
@@ -1760,10 +1760,12 @@ event_proc(Widget widget, XtPointer client_data, XEvent *event, Boolean *continu
               v->cur_ch == KEY_6 ||
               v->cur_ch == KEY_7)
                return;
+               /* intentional fall through */
         case OCT:
            if(v->cur_ch == KEY_8 ||
               v->cur_ch == KEY_9)
                return;
+               /* intentional fall through */
         case DEC:
            if(v->cur_ch == KEY_A ||
               v->cur_ch == KEY_B ||
@@ -1772,6 +1774,7 @@ event_proc(Widget widget, XtPointer client_data, XEvent *event, Boolean *continu
               v->cur_ch == KEY_E ||
               v->cur_ch == KEY_F)
                return;
+               /* intentional fall through */
         default: /* HEX, allow all keys */
           break;
       }
@@ -1977,8 +1980,8 @@ get_next_event(Widget widget, int ev_action, XEvent *xevent)
       else if (ksym == XK_Control_R  && down) return(CONTROL);
       else if (ksym == XK_Control_R  && up) return(CONTROL);
       else if (ksym == XK_Meta_L  && down) return(META);
-      else if (ksym == XK_Meta_R  && up) return(META);
-      else if (ksym == XK_Meta_L  && down) return(META);
+      else if (ksym == XK_Meta_L  && up) return(META);
+      else if (ksym == XK_Meta_R  && down) return(META);
       else if (ksym == XK_Meta_R  && up) return(META);
       else if (ksym == XK_Alt_L  && down) return(ALT);
       else if (ksym == XK_Alt_R  && up) return(ALT);
@@ -2477,7 +2480,7 @@ set_item(enum item_type itemno, char *str)
 {
   Widget w ;
   XmString cstr ;
-  char *tmpStr, *ptr, displayStr[50];
+  char *tmpStr, *ptr, displayStr[50] = "";
 
   if (itemno == DISPLAYITEM)
     {