[GNUnet-SVN] r11960 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-06-25 20:15:30 +0200 (Fri, 25 Jun 2010)
New Revision: 11960

Modified:
   gnunet/src/fs/fs_uri.c
   gnunet/src/fs/gnunet-service-fs.c
Log:
fix

Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c      2010-06-25 18:11:37 UTC (rev 11959)
+++ gnunet/src/fs/fs_uri.c      2010-06-25 18:15:30 UTC (rev 11960)
@@ -1094,6 +1094,7 @@
       if (ret->data.ksk.keywordCount >= GNUNET_MAX_MALLOC_CHECKED / sizeof 
(char*))
        {
          GNUNET_break (0);
+         GNUNET_free (ret);
          return NULL;
        }
       if (ret->data.ksk.keywordCount > 0)

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-06-25 18:11:37 UTC (rev 11959)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-06-25 18:15:30 UTC (rev 11960)
@@ -2614,7 +2614,6 @@
   GNUNET_HashCode query;
   struct ProcessReplyClosure prq;
   const struct SBlock *sb;
-  struct ConnectedPeer *cps;
 
   msize = ntohs (message->size);
   if (msize < sizeof (struct PutMessage))
@@ -2661,6 +2660,8 @@
   if (other != NULL)
     prq.sender = GNUNET_CONTAINER_multihashmap_get (connected_peers,
                                                    &other->hashPubKey);
+  else
+    prq.sender = NULL;
   prq.size = dsize;
   prq.type = type;
   prq.expiration = expiration;
@@ -2670,17 +2671,11 @@
                                              &query,
                                              &process_reply,
                                              &prq);
-  cps = GNUNET_CONTAINER_multihashmap_get (connected_peers,
-                                          &other->hashPubKey);
-  if (cps != NULL)
+  if (prq.sender != NULL)
     {
-      cps->inc_preference += CONTENT_BANDWIDTH_VALUE + 1000 * prq.priority;
-      cps->trust_delta += prq.priority;
+      prq.sender->inc_preference += CONTENT_BANDWIDTH_VALUE + 1000 * 
prq.priority;
+      prq.sender->trust_delta += prq.priority;
     }
-  else
-    {
-      GNUNET_break (0);
-    }
   if (GNUNET_YES == active_migration)
     {
 #if DEBUG_FS