don't access uninitialized memory

When CELT is not available, there are less parameters
however, desc->nparams must contain the actual number
of parameters.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4351 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackNetAdapter.cpp

@@ -408,8 +408,7 @@ extern "C"
         strcpy(desc->name, "netadapter");                              // size MUST be less then JACK_DRIVER_NAME_MAX + 1
         strcpy(desc->desc, "netjack net <==> audio backend adapter");  // size MUST be less then JACK_DRIVER_PARAM_DESC + 1
 
-        desc->nparams = 12;
-        desc->params = (jack_driver_param_desc_t*) calloc(desc->nparams, sizeof(jack_driver_param_desc_t));
+        desc->params = (jack_driver_param_desc_t*) calloc(12, sizeof(jack_driver_param_desc_t));
 
         int i = 0;
         strcpy(desc->params[i].name, "multicast_ip");
@@ -509,6 +508,8 @@ extern "C"
         strcpy (desc->params[i].short_desc, "Auto connect netmaster to system ports");
         strcpy (desc->params[i].long_desc, desc->params[i].short_desc);
 
+        desc->nparams = i + 1;
+
         return desc;
     }
 

common/JackNetDriver.cpp

@@ -604,8 +604,7 @@ namespace Jack
             strcpy(desc->name, "net");                             // size MUST be less then JACK_DRIVER_NAME_MAX + 1
             strcpy(desc->desc, "netjack slave backend component"); // size MUST be less then JACK_DRIVER_PARAM_DESC + 1
 
-            desc->nparams = 11;
-            desc->params = (jack_driver_param_desc_t*) calloc(desc->nparams, sizeof(jack_driver_param_desc_t));
+            desc->params = (jack_driver_param_desc_t*) calloc(11, sizeof(jack_driver_param_desc_t));
 
             int i = 0;
             strcpy(desc->params[i].name, "multicast_ip");
@@ -696,6 +695,8 @@ namespace Jack
             strcpy(desc->params[i].short_desc, "Slow, Normal or Fast mode.");
             strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
 
+            desc->nparams = i + 1;
+
             return desc;
         }
 

common/JackNetOneDriver.cpp

@@ -784,8 +784,7 @@ extern "C"
         strcpy ( desc->name, "netone" );                             // size MUST be less then JACK_DRIVER_NAME_MAX + 1
         strcpy ( desc->desc, "netjack one slave backend component" ); // size MUST be less then JACK_DRIVER_PARAM_DESC + 1
 
-        desc->nparams = 18;
-        params = ( jack_driver_param_desc_t* ) calloc ( desc->nparams, sizeof ( jack_driver_param_desc_t ) );
+        params = ( jack_driver_param_desc_t* ) calloc ( 18, sizeof ( jack_driver_param_desc_t ) );
 
         int i = 0;
         strcpy (params[i].name, "audio-ins");
@@ -944,6 +943,8 @@ extern "C"
                 "always use deadline");
         strcpy (params[i].long_desc, params[i].short_desc);
 
+        desc->nparams = i + 1;
+
         desc->params = params;
 
         return desc;