[GNUnet-SVN] r30083 - gnunet/src/ats

[gnunet]

Author: oehlmann
Date: 2013-10-10 13:25:12 +0200 (Thu, 10 Oct 2013)
New Revision: 30083

Modified:
   gnunet/src/ats/libgnunet_plugin_ats_ril.c
Log:
-malloc fix for matrix W
-null-pointer fix

Modified: gnunet/src/ats/libgnunet_plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_ril.c   2013-10-10 11:11:32 UTC (rev 
30082)
+++ gnunet/src/ats/libgnunet_plugin_ats_ril.c   2013-10-10 11:25:12 UTC (rev 
30083)
@@ -572,7 +572,7 @@
       solver->plugin_envi->bandwidth_changed_cb 
(solver->plugin_envi->bw_changed_cb_cls,
           new_address);
     }
-    else
+    else if (agent->address_inuse)
     {
       GNUNET_assert(0 == ntohl (agent->address_inuse->assigned_bw_in.value__));
       GNUNET_assert(0 == ntohl 
(agent->address_inuse->assigned_bw_out.value__));
@@ -884,7 +884,7 @@
 static void
 envi_do_action (struct GAS_RIL_Handle *solver, struct RIL_Peer_Agent *agent, 
int action)
 {
-  unsigned int address_index;
+  int address_index;
 
   switch (action)
   {
@@ -1050,7 +1050,7 @@
   agent->active = GNUNET_NO;
   agent->n = RIL_ACTION_TYPE_NUM;
   agent->m = solver->networks_count * RIL_FEATURES_NETWORK_COUNT;
-  agent->W = (double **) GNUNET_malloc (sizeof (double) * agent->n);
+  agent->W = (double **) GNUNET_malloc (sizeof (double *) * agent->n);
   for (i = 0; i < agent->n; i++)
   {
     agent->W[i] = (double *) GNUNET_malloc (sizeof (double) * agent->m);