Update the news to clarify S3 bug fix.

It's useful to be explicit on which htslib versions were affected by this bug.

Fixes #2043

Signed-off-by: James Bonfield <jkb@sanger.ac.uk>

Author: jkbonfield

NEWS

@@ -74,7 +74,11 @@ Bug fixes
   (PR #1992, PR #1993, PR #2004, PR #2010)
 
 * Fix s3_seek returning wrong offset on cache-hit.
-  (PR #2012.  Thanks to Nick Edwards)
+  This caused unreliability reading of S3 data when using the
+  multi-region iterator. The bug affects 1.23 and 1.23.1.
+  Releases prior to 1.23 were unaffected.
+  (PR #2012.  Thanks to Nick Edwards.
+   Also fixes #2043 reported by Andrew J. Tock.)
 
 * Remove a signed overflow bug in bgzf_read_small.
   (PR #2013)

vcf.c

@@ -2182,6 +2182,10 @@ static int bcf_record_check(const bcf_hdr_t *hdr, bcf1_t *rec) {
             if (end - ptr < bytes) goto bad_indiv;
             ptr += bytes;
         }
+//        if (((size_t)num << bcf_type_shift[type]) * rec->n_sample > INT_MAX) {
+//            err |= BCF_ERR_LIMITS;
+//            hts_log_warning("Excessive memory required by FORMAT");
+//        }
     }
 
     if (!err && rec->rlen < 0) {
@@ -3095,7 +3099,7 @@ typedef struct {
     int key;            // Key for h->id[BCF_DT_ID][key] vdict
     int max_m;          // number of elements in field array (ie commas)
     int size;           // field size (max_l or max_g*4 if is_gt)
-    int offset;         // offset of buf into h->mem
+    unsigned int offset;         // offset of buf into h->mem
     uint32_t is_gt:1,   // is genotype
              max_g:31;  // maximum number of genotypes
     uint32_t max_l;     // length of field
@@ -3326,7 +3330,7 @@ static int vcf_parse_format_alloc4(kstring_t *s, const bcf_hdr_t *h, bcf1_t *v,
         // Limit the total memory to ~2Gb per VCF row.  This should mean
         // malformed VCF data is less likely to take excessive memory and/or
         // time.
-        if ((uint64_t) mem->l + v->n_sample * (uint64_t)f->size > INT_MAX) {
+        if (0 && (uint64_t) mem->l + v->n_sample * (uint64_t)f->size > INT_MAX) {
             static int warned = 0;
             if ( !warned ) hts_log_warning("Excessive memory required by FORMAT fields at %s:%"PRIhts_pos, bcf_seqname_safe(h,v), v->pos+1);
             warned = 1;
@@ -3342,7 +3346,7 @@ static int vcf_parse_format_alloc4(kstring_t *s, const bcf_hdr_t *h, bcf1_t *v,
             v->errcode |= BCF_ERR_LIMITS;
             return -1;
         }
-        mem->l += v->n_sample * f->size;
+        mem->l += v->n_sample * (uint64_t)f->size;
     }
 
     {