Merge branch 'jk/drop-sha1-entry-pos' into next

diff --git a/urlmatch.c b/urlmatch.c
index 4bbde924e8bf7e73f4f696d0319235ec56263a8f..3e42bd750485d67bb6151ab5f15ac09a0d887502 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -42,12 +42,12 @@ static int append_normalized_escapes(struct strbuf *buf,
 
                from_len--;
                if (ch == '%') {
-                       if (from_len < 2 ||
-                           !isxdigit(from[0]) ||
-                           !isxdigit(from[1]))
+                       if (from_len < 2)
                                return 0;
-                       ch = hexval(*from++) << 4;
-                       ch |= hexval(*from++);
+                       ch = hex2chr(from);
+                       if (ch < 0)
+                               return 0;
+                       from += 2;
                        from_len -= 2;
                        was_esc = 1;
                }