[GNUnet-SVN] r24921 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-11-13 01:22:35 +0100 (Tue, 13 Nov 2012)
New Revision: 24921

Modified:
   gnunet/src/util/common_allocation.c
Log:
-wtf

Modified: gnunet/src/util/common_allocation.c
===================================================================
--- gnunet/src/util/common_allocation.c 2012-11-12 18:14:38 UTC (rev 24920)
+++ gnunet/src/util/common_allocation.c 2012-11-13 00:22:35 UTC (rev 24921)
@@ -272,7 +272,7 @@
   char *res;
 
   GNUNET_assert_at (str != NULL, filename, linenumber);
-  len = GNUNET_MIN (len, strlen (str));
+  len = strnlen (str, len);
   res = GNUNET_xmalloc_ (len + 1, filename, linenumber);
   memcpy (res, str, len);
   /* res[len] = '\0'; 'malloc' zeros out anyway */