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

[gnunet]

Author: grothoff
Date: 2013-03-22 09:44:33 +0100 (Fri, 22 Mar 2013)
New Revision: 26565

Modified:
   gnunet/src/util/strings.c
Log:
-never assert on bogus input, return error code

Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2013-03-22 08:25:41 UTC (rev 26564)
+++ gnunet/src/util/strings.c   2013-03-22 08:44:33 UTC (rev 26565)
@@ -852,7 +852,8 @@
     return GNUNET_SYSERR;
   while (wpos > 0)
   {
-    GNUNET_assert (rpos > 0);
+    if (0 == rpos)
+      return GNUNET_SYSERR;
     bits = ((ret = getValue__ (enc[--rpos])) << vbit) | bits;
     if (-1 == ret)
       return GNUNET_SYSERR;
@@ -864,9 +865,9 @@
       vbit -= 8;
     }
   }
-  GNUNET_assert (rpos == 0);
-  GNUNET_assert (vbit == 0);
-
+  if ( (0 != rpos) ||
+       (0 != vbit) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }