5 files changed, 21 insertions, 12 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject 53d0992890e1ebb8f8c6bd747533abe157baec6
+Subproject cc2d9bdb3e90af5ddebf964e3da492c04a30741
diff --git a/contrib/handbook b/contrib/handbook
-Subproject c309e416984fc76e4b39adcbd4e8a602d94b198
+Subproject 7d66dc1695829f2511f8e8ecc227a64d73d1562
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8872ddca1..382232226 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -99,6 +99,7 @@ src/contrib/service/set/ibf_sim.c
 src/contrib/service/set/plugin_block_set_test.c
 src/contrib/service/set/set_api.c
 src/contrib/service/template/gnunet-service-template.c
+src/gana/gnunet-error-codes/gnunet_error_codes.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 00538847b..4d052c57b 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -147,7 +147,7 @@ libgnunetutil_la_LIBADD = \
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 16:0:0
+  -version-info 16:1:0
 
 lib_LTLIBRARIES = libgnunetutil.la
 
diff --git a/src/lib/util/strings.c b/src/lib/util/strings.c
index fe7a030dd..dc9fd0daf 100644
--- a/src/lib/util/strings.c
+++ b/src/lib/util/strings.c
@@ -37,7 +37,7 @@
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-strings", __VA_ARGS__)
 
 #define LOG_STRERROR(kind, syscall) \
-  GNUNET_log_from_strerror (kind, "util-strings", syscall)
+        GNUNET_log_from_strerror (kind, "util-strings", syscall)
 
 
 size_t
@@ -1699,7 +1699,7 @@ GNUNET_STRINGS_base64url_encode (const void *in,
 
 
 #define cvtfind(a)                        \
-  ((((a) >= 'A') && ((a) <= 'Z'))         \
+        ((((a) >= 'A') && ((a) <= 'Z'))         \
    ? (a) - 'A'                          \
    : (((a) >= 'a') && ((a) <= 'z'))     \
    ? (a) - 'a' + 26                 \
@@ -1709,15 +1709,15 @@ GNUNET_STRINGS_base64url_encode (const void *in,
 
 
 #define CHECK_CRLF                                                \
-  while ( (data[i] == '\r') || (data[i] == '\n') )                \
-  {                                                               \
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, \
-                "ignoring CR/LF\n");                              \
-    i++;                                                          \
-    if (i >= len) {                                               \
-      goto END;                                                   \
-    }                                                             \
-  }
+        while ( (data[i] == '\r') || (data[i] == '\n') )                \
+        {                                                               \
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, \
+                      "ignoring CR/LF\n");                              \
+          i++;                                                          \
+          if (i >= len) {                                               \
+            goto END;                                                   \
+          }                                                             \
+        }
 
 
 size_t
@@ -1853,7 +1853,15 @@ GNUNET_STRINGS_urldecode (const char *data,
       if (1 != sscanf (rpos + 1,
                        "%2x",
                        &num))
+      {
+        /* Invalid URL encoding, try to continue anyway */
+        GNUNET_break_op (0);
+        *wpos = *rpos;
+        wpos++;
+        resl++;
+        rpos++;
         break;
+      }
       *wpos = (char) ((unsigned char) num);
       wpos++;
       resl++;