X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Furi.c;h=1ebb5306af22f61ef79b82db1e9560431a7c6146;hp=6db68e5569a2e444704044fe564e49013e933782;hb=4fc6e040f08c366277d3405f178c62c580c7416c;hpb=a2fc23c434e6d48490bc862715898ee4e058ef05

diff --git a/src/uri.c b/src/uri.c
index 6db68e5..1ebb530 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -132,7 +132,7 @@ int yaz_uri_to_array(const char *path, ODR o, char ***name, char ***val)
     {
         cp++;
         no++;
-        while (*cp != '=')
+        while (*cp && *cp != '=' && *cp != '&')
         {
             /* check that x-form names looks sane */
             if (*cp <= ' ' || *cp >= 127)