Fixed bug #1338: GFS crashes when startRecord > number of hits.

[yaz-moved-to-github.git] / src / seshigh.c

diff --git a/src/seshigh.c b/src/seshigh.c
index 999d1ba..c10ae91 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.121 2007-05-30 21:56:59 adam Exp $
+ * $Id: seshigh.c,v 1.123 2007-07-27 08:05:52 adam Exp $
  */
 /**
  * \file seshigh.c
@@ -990,12 +990,14 @@ static void srw_bend_search(association *assoc, request *req,
                         odr_intdup(assoc->encode, *rr.srw_setnameIdleTime );
                }
                 
-                if ((rr.hits > 0 && start > rr.hits) || start < 1)
+                if (start > rr.hits || start < 1)
                 {
-                    yaz_add_srw_diagnostic(
-                        assoc->encode, 
-                        &srw_res->diagnostics, &srw_res->num_diagnostics,
-                        YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0);
+                    /* if hits<=0 and start=1 we don't return a diagnostic */
+                    if (start != 1)
+                        yaz_add_srw_diagnostic(
+                            assoc->encode, 
+                            &srw_res->diagnostics, &srw_res->num_diagnostics,
+                            YAZ_SRW_FIRST_RECORD_POSITION_OUT_OF_RANGE, 0);
                 }
                 else if (number > 0)
                 {
@@ -1856,7 +1858,7 @@ static void process_http_request(association *assoc, request *req)
 #endif
                 {0, 0, 0}
             };
-            char ctype[60];
+            char ctype[80];
             int ret;
             p = z_get_HTTP_Response(o, 200);
             hres = p->u.HTTP_Response;
@@ -1874,7 +1876,7 @@ static void process_http_request(association *assoc, request *req)
             hres->code = http_code;
 
             strcpy(ctype, "text/xml");
-            if (charset)
+            if (charset && strlen(charset) < sizeof(ctype)-30)
             {
                 strcat(ctype, "; charset=");
                 strcat(ctype, charset);
@@ -2355,7 +2357,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.121 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.123 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,