1 files changed, 1 insertions, 1 deletions

diff --git a/src/util/strings.c b/src/util/strings.c
index 9d6f4039e..014302c01 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -2148,7 +2148,7 @@ GNUNET_STRINGS_urlencode (const char *data, size_t len, char **out)
   struct GNUNET_Buffer buf = { 0 };
   const uint8_t *i8 = (uint8_t *) data;
 
-  while (0 != *i8)
+  while ((i8 - (uint8_t *) data) < len && 0 != *i8)
   {
     if (0 == (0x80 & *i8))
     {