[GNUnet-SVN] r1354 - Extractor/src/plugins GNUnet/src/applications/stats

[grothoff]

Author: grothoff
Date: 2005-07-09 08:28:15 -0700 (Sat, 09 Jul 2005)
New Revision: 1354

Modified:
   Extractor/src/plugins/convert.c
   GNUnet/src/applications/stats/statistics.c
Log:
sync

Modified: Extractor/src/plugins/convert.c
===================================================================
--- Extractor/src/plugins/convert.c     2005-07-09 15:25:51 UTC (rev 1353)
+++ Extractor/src/plugins/convert.c     2005-07-09 15:28:15 UTC (rev 1354)
@@ -43,7 +43,7 @@
 
   i = input;
   cd = iconv_open("UTF-8", charset);
-  if (cd == (iconv_t) -1)
+  if (cd == (iconv_t) -1) 
     return strdup(i);
   tmpSize = 3 * len + 4;
   tmp = malloc(tmpSize);

Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c  2005-07-09 15:25:51 UTC (rev 
1353)
+++ GNUnet/src/applications/stats/statistics.c  2005-07-09 15:28:15 UTC (rev 
1354)
@@ -273,6 +273,8 @@
       mpos += strlen(descriptions[pos])+1;
     }
     statMsg->statCounters = htonl(end - start);
+    GNUNET_ASSERT(mpos + sizeof(STATS_CS_MESSAGE) < MAX_BUFFER_SIZE);
+
     statMsg->header.size = htons(mpos + sizeof(STATS_CS_MESSAGE));
     /* printf("writing message of size %d with stats %d to %d out of %d to 
socket\n",
        ntohs(statMsg->header.size),