X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Furi.c;h=33120ed104b7bc4b3af66417022e0b51053f013e;hp=6db68e5569a2e444704044fe564e49013e933782;hb=cf0d647d4a642af04013d09f412e8629897187c5;hpb=028d5f9639695599a98f59ef8a59e7f03bc135f7

diff --git a/src/uri.c b/src/uri.c
index 6db68e5..33120ed 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -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)