GFS: fix sizeof: saved by the bell

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

diff --git a/src/seshigh.c b/src/seshigh.c
index cdc9fdc..bd1ec84 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -127,6 +127,16 @@ static void wr_diag(WRBUF w, int error, const char *addinfo)
     wrbuf_puts(w, " ");    
 }
 
+static int odr_int_to_int(Odr_int v)
+{
+    if (v >= INT_MAX)
+        return INT_MAX;
+    else if (v <= INT_MIN)
+        return INT_MIN;
+    else
+        return (int) v;
+}
+
 /*
  * Create and initialize a new association-handle.
  *  channel  : iochannel for the current line.
@@ -836,16 +846,7 @@ static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset,
     return 0;
 }
 
-static int odr_int_to_int(Odr_int v)
-{
-    if (v >= INT_MAX)
-        return INT_MAX;
-    else if (v <= INT_MIN)
-        return INT_MIN;
-    else return v;
-}
-
-static void srw_bend_search(association *assoc, request *req,
+static void srw_bend_search(association *assoc,
                             Z_SRW_PDU *sr,
                             Z_SRW_PDU *res,
                             int *http_code)
@@ -1148,7 +1149,7 @@ static void srw_bend_search(association *assoc, request *req,
     }
 }
 
-static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
+static char *srw_bend_explain_default(bend_explain_rr *rr)
 {
 #if YAZ_HAVE_XML2
     xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr;
@@ -1184,7 +1185,7 @@ static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
     return 0;
 }
 
-static void srw_bend_explain(association *assoc, request *req,
+static void srw_bend_explain(association *assoc,
                              Z_SRW_PDU *sr,
                              Z_SRW_explainResponse *srw_res,
                              int *http_code)
@@ -1210,7 +1211,7 @@ static void srw_bend_explain(association *assoc, request *req,
         if (assoc->init->bend_explain)
             (*assoc->init->bend_explain)(assoc->backend, &rr);
         else
-            srw_bend_explain_default(assoc->backend, &rr);
+            srw_bend_explain_default(&rr);
 
         if (rr.explain_buf)
         {
@@ -1232,7 +1233,7 @@ static void srw_bend_explain(association *assoc, request *req,
     }
 }
 
-static void srw_bend_scan(association *assoc, request *req,
+static void srw_bend_scan(association *assoc,
                           Z_SRW_PDU *sr,
                           Z_SRW_scanResponse *srw_res,
                           int *http_code)
@@ -1244,6 +1245,7 @@ static void srw_bend_scan(association *assoc, request *req,
     srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
     if (srw_res->num_diagnostics == 0 && assoc->init)
     {
+        int step_size = 0;
         struct scan_entry *save_entries;
 
         bend_scan_rr *bsrr = (bend_scan_rr *)
@@ -1254,14 +1256,14 @@ static void srw_bend_scan(association *assoc, request *req,
         bsrr->num_entries = srw_req->maximumTerms ?
             odr_int_to_int(*srw_req->maximumTerms) : 10;
         bsrr->term_position = srw_req->responsePosition ?
-            *srw_req->responsePosition : 1;
+            odr_int_to_int(*srw_req->responsePosition) : 1;
 
         bsrr->errcode = 0;
         bsrr->errstring = 0;
         bsrr->referenceId = 0;
         bsrr->stream = assoc->encode;
         bsrr->print = assoc->print;
-        bsrr->step_size = odr_intdup(assoc->decode, 0);
+        bsrr->step_size = &step_size;
         bsrr->entries = 0;
         bsrr->setname = 0;
 
@@ -1419,7 +1421,7 @@ static void srw_bend_scan(association *assoc, request *req,
 
 }
 
-static void srw_bend_update(association *assoc, request *req,
+static void srw_bend_update(association *assoc,
                            Z_SRW_PDU *sr,
                            Z_SRW_updateResponse *srw_res,
                            int *http_code)
@@ -1788,7 +1790,7 @@ static void process_http_request(association *assoc, request *req)
             }
             else
             {
-                srw_bend_search(assoc, req, sr, res, &http_code);
+                srw_bend_search(assoc, sr, res, &http_code);
             }
             if (http_code == 200)
                 soap_package->u.generic->p = res;
@@ -1803,8 +1805,7 @@ static void process_http_request(association *assoc, request *req)
                 res->u.explain_response->diagnostics = diagnostic;
                 res->u.explain_response->num_diagnostics = num_diagnostic;
             }
-            srw_bend_explain(assoc, req, sr,
-                             res->u.explain_response, &http_code);
+            srw_bend_explain(assoc, sr, res->u.explain_response, &http_code);
             if (http_code == 200)
                 soap_package->u.generic->p = res;
         }
@@ -1818,8 +1819,7 @@ static void process_http_request(association *assoc, request *req)
                 res->u.scan_response->diagnostics = diagnostic;
                 res->u.scan_response->num_diagnostics = num_diagnostic;
             }
-            srw_bend_scan(assoc, req, sr,
-                          res->u.scan_response, &http_code);
+            srw_bend_scan(assoc, sr, res->u.scan_response, &http_code);
             if (http_code == 200)
                 soap_package->u.generic->p = res;
         }
@@ -1834,8 +1834,7 @@ static void process_http_request(association *assoc, request *req)
                 res->u.update_response->num_diagnostics = num_diagnostic;
             }
             yaz_log(YLOG_DEBUG, "num_diag = %d", res->u.update_response->num_diagnostics );
-            srw_bend_update(assoc, req, sr,
-                            res->u.update_response, &http_code);
+            srw_bend_update(assoc, sr, res->u.update_response, &http_code);
             if (http_code == 200)
                 soap_package->u.generic->p = res;
         }
@@ -2089,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;
 
@@ -2289,10 +2288,10 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options);
 
     if (*req->maximumRecordSize < assoc->maximumRecordSize)
-        assoc->maximumRecordSize = *req->maximumRecordSize;
+        assoc->maximumRecordSize = odr_int_to_int(*req->maximumRecordSize);
 
     if (*req->preferredMessageSize < assoc->preferredMessageSize)
-        assoc->preferredMessageSize = *req->preferredMessageSize;
+        assoc->preferredMessageSize = odr_int_to_int(*req->preferredMessageSize);
 
     resp->preferredMessageSize =
         odr_intdup(assoc->encode, assoc->preferredMessageSize);
@@ -2424,13 +2423,19 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start,
         (Z_Records *) odr_malloc(a->encode, sizeof(*records));
     Z_NamePlusRecordList *reclist =
         (Z_NamePlusRecordList *) odr_malloc(a->encode, sizeof(*reclist));
-    Z_NamePlusRecord **list =
-        (Z_NamePlusRecord **) odr_malloc(a->encode, sizeof(*list) * toget);
 
     records->which = Z_Records_DBOSD;
     records->u.databaseOrSurDiagnostics = reclist;
     reclist->num_records = 0;
-    reclist->records = list;
+
+    if (toget < 0)
+        return diagrec(a, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, 0);
+    else if (toget == 0)
+        reclist->records = odr_nullval();
+    else
+        reclist->records = (Z_NamePlusRecord **)
+            odr_malloc(a->encode, sizeof(*reclist->records) * toget);
+
     *pres = Z_PresentStatus_success;
     *num = 0;
     *next = 0;
@@ -2917,6 +2922,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb)
     bend_scan_rr *bsrr = (bend_scan_rr *)
         odr_malloc(assoc->encode, sizeof(*bsrr));
     struct scan_entry *save_entries;
+    int step_size = 0;
 
     yaz_log(log_requestdetail, "Got ScanRequest");
 
@@ -2925,9 +2931,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb)
     res->referenceId = req->referenceId;
 
     /* if step is absent, set it to 0 */
-    res->stepSize = odr_intdup(assoc->encode, 0);
     if (req->stepSize)
-        *res->stepSize = *req->stepSize;
+        step_size = odr_int_to_int(*req->stepSize);
 
     res->scanStatus = scanStatus;
     res->numberOfEntriesReturned = numberOfEntriesReturned;
@@ -2956,7 +2961,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb)
     bsrr->referenceId = req->referenceId;
     bsrr->stream = assoc->encode;
     bsrr->print = assoc->print;
-    bsrr->step_size = res->stepSize;
+    bsrr->step_size = &step_size;
     bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo, 
                                           yaz_oid_userinfo_scan_set, 1, 0);
     bsrr->entries = 0;
@@ -2988,7 +2993,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb)
     log_scan_term_level(log_requestdetail, req->termListAndStartPoint, 
                         bsrr->attributeset);
     bsrr->term_position = req->preferredPositionInResponse ?
-        *req->preferredPositionInResponse : 1;
+        odr_int_to_int(*req->preferredPositionInResponse) : 1;
 
     ((int (*)(void *, bend_scan_rr *))
      (*assoc->init->bend_scan))(assoc->backend, bsrr);
@@ -3006,11 +3011,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb)
             *scanStatus = Z_Scan_partial_5;
         else
             *scanStatus = Z_Scan_success;
+        res->stepSize = odr_intdup(assoc->encode, step_size);
         ents->entries = tab;
         ents->num_entries = bsrr->num_entries;
         res->numberOfEntriesReturned = odr_intdup(assoc->encode, 
                                                    ents->num_entries);
-        res->positionOfTerm = &bsrr->term_position;
+        res->positionOfTerm = odr_intdup(assoc->encode, bsrr->term_position);
         for (i = 0; i < bsrr->num_entries; i++)
         {
             Z_Entry *e;
@@ -3209,7 +3215,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb)
     bdrr->statuses = 0;
     if (bdrr->num_setnames > 0)
     {
-        bdrr->statuses = (Odr_int*) 
+        bdrr->statuses = (int*) 
             odr_malloc(assoc->encode, sizeof(*bdrr->statuses) *
                        bdrr->num_setnames);
         for (i = 0; i < bdrr->num_setnames; i++)
@@ -3239,7 +3245,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb)
                 (Z_ListStatus *)
                 odr_malloc(assoc->encode,
                             sizeof(**res->deleteListStatuses->elements));
-            res->deleteListStatuses->elements[i]->status = bdrr->statuses+i;
+            res->deleteListStatuses->elements[i]->status =
+                odr_intdup(assoc->encode, bdrr->statuses[i]);
             res->deleteListStatuses->elements[i]->id =
                 odr_strdup(assoc->encode, bdrr->setnames[i]);
         }