GFS: Fix nextResultSetPosition for dropped record

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

diff --git a/src/seshigh.c b/src/seshigh.c
index 44d6619..b9801ff 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2088,7 +2088,7 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res)
  */
 static int process_z_response(association *assoc, request *req, Z_APDU *res)
 {
-    Z_GDU *gres = (Z_GDU *) odr_malloc(assoc->encode, sizeof(*res));
+    Z_GDU *gres = (Z_GDU *) odr_malloc(assoc->encode, sizeof(*gres));
     gres->which = Z_GDU_Z3950;
     gres->u.z3950 = res;
 
@@ -2518,6 +2518,8 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start,
             {
                 yaz_log(log_requestdetail, "  Dropped last normal-sized record");
                 *pres = Z_PresentStatus_partial_2;
+                if (*next > 0)
+                    (*next)--;
                 break;
             }
             /* record can only be fetched by itself */