more coverity issues

fq_bench.c

@@ -89,24 +89,30 @@ static void parse_cli(int argc, char **argv) {
         usage(argv[0]);
         exit(0);
       case 'h':
+        free(host);
         host = strdup(optarg);
         break;
       case 'p':
         port = atoi(optarg);
         break;
       case 'u':
+        free(user);
         user = strdup(optarg);
         break;
       case 'P':
+        free(pass);
         pass = strdup(optarg);
         break;
       case 't':
+        free(type);
         type = strdup(optarg);
         break;
       case 'q':
+        free(queue_name);
         queue_name = strdup(optarg);
         break;
       case 'e':
+        free(exchange);
         exchange = strdup(optarg);
         break;
       case 'c':

fq_utils.c

@@ -141,7 +141,8 @@ void fq_debug_set_string(const char *s) {
 
   /* then comma separated named */
   if(strlen(s) > sizeof(copy) - 1) return;
-  strncpy(copy,s,sizeof(copy));
+  /* copy including null terminator */
+  memcpy(copy,s,strlen(s)+1);
   while(NULL != (tok = strtok_r(tok ? NULL : copy, ",", &lastsep))) {
 #define SETBIT(tok, A) do { \
   if(!strcasecmp(tok, #A + 9)) fq_debug_bits |= A; \

fqd_http.c

@@ -490,7 +490,7 @@ fqd_http_add_checkpoint(struct http_req *req) {
 
   /* validate chkptid format */
   char ckid[48] = {0};
-  strncpy(ckid, chkptid, sizeof(ckid));
+  strncpy(ckid, chkptid, sizeof(ckid)-1);
   const char *log_string = ckid;
   char *sep = strchr(ckid, ':');
   if (sep == NULL) {

fqd_peer.c

@@ -141,11 +141,11 @@ fqd_peer_cleanup_hook(fq_client conn) {
   int i;
   fqd_peer_connection *peer;
   peer = fq_client_get_userdata(conn);
-  if(peer->bindings) free(peer->bindings);
   for(i=0;i<peer->n_bindings;i++) {
     peer_binding_info *bi = peer->bindings[i];
     free(bi->prog);
   }
+  if(peer->bindings) free(peer->bindings);
   if(peer->host) free(peer->host);
   if(peer->user) free(peer->user);
   if(peer->pass) free(peer->pass);