Make sure we are using header lastsect field correctly.

It is (and always has been) the last sector + 1.

clientside/os/imagezip/imagedelta.c

@@ -688,7 +688,7 @@ chunkify(struct ndz_rangemap *mmap, struct ndz_range *range, void *arg)
 	/* XXX should always be zero */
 	if (cstate->chunkno == 0)
 	    cstate->header->firstsect = 0;
-	cstate->header->lastsect = delta.ndz->maphi;
+	cstate->header->lastsect = delta.ndz->maphi + 1;
 
 	/* include any relocations */
 	if (delta.ndz->relocentries > 0) {

clientside/os/imagezip/imagehdr.h

@@ -83,7 +83,7 @@ struct blockhdr_V2 {
 	int32_t		regioncount;	/* number of regions */
 	/* V2 follows */
 	uint32_t	firstsect;	/* first sector described by block */
-	uint32_t	lastsect;	/* last sector described by block */
+	uint32_t	lastsect;	/* first sector past block */
 	int32_t		reloccount;	/* number of reloc entries */
 };
 
@@ -120,7 +120,7 @@ struct blockhdr_V4 {
 	int32_t		regioncount;	/* number of regions */
 	/* V2 follows */
 	uint32_t	firstsect;	/* first sector described by block */
-	uint32_t	lastsect;	/* last sector described by block */
+	uint32_t	lastsect;	/* first sector past block */
 	int32_t		reloccount;	/* number of reloc entries */
 	/* V4 follows */
 	uint16_t	enc_cipher;	/* cipher was used to encrypt */

clientside/os/imagezip/imagerezip.c

@@ -645,7 +645,7 @@ chunkify(struct ndz_rangemap *mmap, struct ndz_range *range, void *arg)
 	/* XXX should always be zero */
 	if (cstate->chunkno == 0)
 	    cstate->header->firstsect = 0;
-	cstate->header->lastsect = new.ndz->maphi;
+	cstate->header->lastsect = new.ndz->maphi + 1;
 
 	/* include any relocations */
 	if (new.ndz->relocentries > 0) {

clientside/os/imagezip/imageundelta.c

@@ -915,7 +915,7 @@ chunkify(struct ndz_rangemap *mmap, struct ndz_range *range, void *arg)
 	/* XXX should always be zero */
 	if (cstate->chunkno == 0)
 	    cstate->header->firstsect = 0;
-	cstate->header->lastsect = new.ndz->maphi;
+	cstate->header->lastsect = new.ndz->maphi + 1;
 
 	/* include any relocations */
 	if (new.ndz->relocentries > 0) {

clientside/os/imagezip/libndz/ndzfile.c

@@ -267,10 +267,10 @@ ndz_readranges(struct ndz_file *ndz)
 	if (hdr->magic != COMPRESSED_V1) {
 	    if (chunkno == 0)
 		first = hdr->firstsect;
-	    last = hdr->lastsect;
+	    last = hdr->lastsect - 1;
 #ifdef USE_CHUNKMAP
 	    clo = hdr->firstsect;
-	    chi = hdr->lastsect;
+	    chi = hdr->lastsect - 1;
 #endif
 	}
 

clientside/os/imagezip/libndz/reloc.c

@@ -121,7 +121,7 @@ ndz_reloc_put(struct ndz_file *ndz, blockhdr_t *hdr, void *buf)
 	return -1;
 
     if (ndz->relocentries == 0 ||
-	hdr->firstsect > ndz->relochi || hdr->lastsect < ndz->reloclo)
+	hdr->firstsect > ndz->relochi || hdr->lastsect <= ndz->reloclo)
 	return 0;
 
     chunkreloc = buf;
@@ -129,10 +129,10 @@ ndz_reloc_put(struct ndz_file *ndz, blockhdr_t *hdr, void *buf)
     for (i = 0; i < ndz->relocentries; i++) {
 	assert(relocdata->sectoff + relocdata->size <= ndz->sectsize);
 	if (relocdata->sector >= hdr->firstsect &&
-	    relocdata->sector <= hdr->lastsect) {
+	    relocdata->sector < hdr->lastsect) {
 #ifdef RELOC_DEBUG
 	    fprintf(stderr, "found reloc for %u in chunk range [%u-%u]\n",
-		    relocdata->sector, hdr->firstsect, hdr->lastsect);
+		    relocdata->sector, hdr->firstsect, hdr->lastsect - 1);
 #endif
 	    *chunkreloc++ = *relocdata;
 	}