diff -ur yaz-2.1.36/client/client.c yaz-2.1.36.new/client/client.c
--- yaz-2.1.36/client/client.c	2006-10-04 09:26:00.000000000 +0200
+++ yaz-2.1.36.new/client/client.c	2006-10-25 07:19:51.000000000 +0200
@@ -2297,6 +2297,7 @@
         char *asn_buf = 0;
         int noread = 0;
         char oid_str[51];
+        union { unsigned char **ucp; char **cp; }pun;
         int oid_value_xmles = VAL_XMLES;
         Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
         Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
@@ -2309,7 +2310,7 @@
         ext->indirect_reference = 0;
         ext->descriptor = 0;
         ext->which = Z_External_octet;
-        ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct));        
+        ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct));
         sscanf(arg, "%50s%n", oid_str, &noread);
         if (noread == 0)
         {
@@ -2324,7 +2325,8 @@
             return 0;
         }
 
-        if (parse_cmd_doc(&arg, out, &asn_buf,
+        pun.ucp = &ext->u.single_ASN1_type->buf;
+        if (parse_cmd_doc(&arg, out, pun.ucp,
                           &ext->u.single_ASN1_type->len, 0) == 0)
             return 0;
 
Only in yaz-2.1.36.new/client: client.c.orig
Only in yaz-2.1.36.new/client: client.c.rej
Only in yaz-2.1.36.new/client: client.c.~1~
diff -ur yaz-2.1.36/src/cqltransform.c yaz-2.1.36.new/src/cqltransform.c
--- yaz-2.1.36/src/cqltransform.c	2006-10-05 18:12:23.000000000 +0200
+++ yaz-2.1.36.new/src/cqltransform.c	2006-10-25 07:16:57.000000000 +0200
@@ -237,7 +237,7 @@
                        void *client_data)
 {
     int exclusion = 0;
-    int distance;               /* to be filled in later depending on unit */
+    int distance = 0;           /* to be filled in later depending on unit */
     int distance_defined = 0;
     int ordered = 0;
     int proxrel = 2;            /* less than or equal */
Only in yaz-2.1.36.new/src: nfaxml.c.orig
Only in yaz-2.1.36.new/src: nfaxml.c.rej
diff -ur yaz-2.1.36/src/zoom-c.c yaz-2.1.36.new/src/zoom-c.c
--- yaz-2.1.36/src/zoom-c.c	2006-10-05 17:10:34.000000000 +0200
+++ yaz-2.1.36.new/src/zoom-c.c	2006-10-25 07:16:57.000000000 +0200
@@ -1336,7 +1336,7 @@
 static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
 {
     int i;
-    int *start, *count;
+    int *start=0, *count=0;
     ZOOM_resultset resultset = 0;
     Z_SRW_PDU *sr = 0;
     const char *option_val = 0;
diff -ur yaz-2.1.36/zoom/zoom-benchmark.c yaz-2.1.36.new/zoom/zoom-benchmark.c
--- yaz-2.1.36/zoom/zoom-benchmark.c	2006-10-05 09:35:09.000000000 +0200
+++ yaz-2.1.36.new/zoom/zoom-benchmark.c	2006-10-25 07:16:57.000000000 +0200
@@ -16,10 +16,10 @@
 
 
 /* naming events */
-static char* zoom_events[10];
+static char* zoom_events[ZOOM_EVENT_END+1];
 
 /* re-sorting event numbers to progress numbers */
-static int zoom_progress[10];
+static int zoom_progress[ZOOM_EVENT_END+1];
 
 /* commando line parameters */
 static struct parameters_t {