bsdiff: force off_t to be 64 bits, honor size_t length

dev-util/bsdiff/files/4.3_bspatch-support-input-output-positioning.patch

-From f8c00fab208cb07e46bc3cb7f651cead857adf07 Mon Sep 17 00:00:00 2001
-From: Andrew de los Reyes <adlr@chromium.org>
-Date: Mon, 19 Apr 2010 15:05:56 -0700
-Subject: [PATCH] bspatch: support input/output positioning
-
-For autoupdate, we need bspatch to read specific blocks from the
-filesystem devic and write back to specific blocks of the device.
-
-Review URL: http://codereview.chromium.org/1595025
----
- files/bspatch.c |  270 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 259 insertions(+), 11 deletions(-)
-
-diff --git a/files/bspatch.c b/files/bspatch.c
-index f4b821c..48ac79a 100644
---- a/files/bspatch.c
-+++ b/files/bspatch.c
+--- work/bsdiff-4.3/bspatch.c   2005-08-16 15:14:00.000000000 -0700
++++ work/bsdiff-4.3-new/bspatch.c       2010-08-04 10:07:05.000000000 -0700
 @@ -3,7 +3,7 @@
   * All rights reserved
   *
   * Redistribution and use in source and binary forms, with or without
 - * modification, are permitted providing that the following conditions 
 + * modification, are permitted providing that the following conditions
   * are met:
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
-@@ -29,6 +29,9 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
+@@ -29,6 +29,9 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/b
  #endif
  
  #include <bzlib.h>
 +#include <errno.h>
 +#include <inttypes.h>
 +#include <stdint.h>
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
-@@ -36,6 +39,235 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
+@@ -36,6 +39,244 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/b
  #include <unistd.h>
  #include <fcntl.h>
  
 +#define JOIN(a, b) __JOIN(a, b)
 +#define __JOIN(a, b) a ## b
 +#define COMPILE_ASSERT(expr, message) \
 +       typedef char JOIN(message, JOIN(_, __LINE__)) [(expr) ? 1 : -1]
 +
 +COMPILE_ASSERT(sizeof(int64_t) == 8, int64_t_64_bit);
++COMPILE_ASSERT(sizeof(off_t) == 8, off_t_64_bit);
 +
 +#define MIN(a, b) \
 +       ((a) < (b) ? (a) : (b))
 +
 +// Reads next int from *ints. The int should be terminated with a comma
 +// or NULL char. *ints will be updated to the space right after the comma
 +// or set to NULL if this was the last number. This assumes the input is
 +// a valid string, as validated with PositionsStringIsValid().
 +// Returns 1 on success.
 +int NextInt64(const char** ints, int64_t *out) {
@@ skipping 15 matching lines @@
 +       }
 +       return 0;
 +}
 +
 +COMPILE_ASSERT(sizeof(intmax_t) == 8, intmax_t_not_64_bit);
 +
 +// Returns 1 if str can be converted to int64_t without over/underflowing.
 +// str is assumed to point to an optional negative sign followed by numbers,
 +// optionally followed by non-numeric characters, followed by '\0'.
 +int IsValidInt64(const char* str) {
-+       const char* end_ptr;
++       const char* end_ptr = 0;
 +       errno = 0;
 +       intmax_t result = strtoimax(str, &end_ptr, /* base: */ 10);
 +       return errno == 0;
 +}
 +
 +// Input validator. Make sure the positions string is well formatted.
 +// All numerical values are checked to make sure they don't over/underflow
 +// int64_t. Returns 1 if valid.
 +int PositionsStringIsValid(const char* positions) {
 +       if (positions == NULL)
@@ skipping 48 matching lines @@
 +                                       state = 0;
 +                                       number_start = positions + 1;
 +                                       negative_valid = !negative_valid;
 +                                       continue;
 +                               }
 +                               return (c == '\0');
 +               }
 +       }
 +}
 +
++static const int64_t kMaxLength = sizeof(size_t) > 4 ? INT64_MAX : SIZE_MAX;
++
 +// Reads into a buffer a series of byte ranges from filename.
 +// Each range is a pair of comma-separated ints from positions.
 +// -1 as an offset means a sparse-hole.
 +// E.g. If positions were "1,5:23,4:-1,8:3,7", then we would return a buffer
 +// consisting of 5 bytes from offset 1 of the file, followed by
 +// 4 bytes from offset 23, then 8 bytes of all zeros, then 7 bytes from
 +// offset 3 in the file.
 +// Returns NULL on error.
 +static char* PositionedRead(const char* filename,
 +                            const char* positions,
@@ skipping 47 matching lines @@
 +                       errx(1, "no support for sparse positions "
 +                            "yet during read\n");
 +               }
 +               if (NextInt64(&p, &read_length) == 0) {
 +                       errx(1, "bad length parse (should never happen)\n");
 +               }
 +               if (read_length < 0) {
 +                       errx(1, "length can't be negative "
 +                            "(should never happen)\n");
 +               }
-+               ssize_t rc = pread(fd, buf_tail, read_length, offset);
++               if (read_length > kMaxLength) {
++                       errx(1, "read length too large\n");
++               }
++               ssize_t rc = pread(fd, buf_tail, (size_t)read_length, (off_t)offset);
 +               if (rc != read_length) {
 +                       errx(1, "read failed\n");
 +               }
 +               buf_tail += rc;
 +       }
 +       close(fd);
 +       *old_size = length;
 +       return buf;
 +}
 +
@@ skipping 13 matching lines @@
 +               int64_t offset, length;
 +               if (NextInt64(&positions, &offset) == 0) {
 +                       break;
 +               }
 +               if (NextInt64(&positions, &length) == 0) {
 +                       errx(1, "bad length parse for write\n");
 +               }
 +               if (length < 0) {
 +                       errx(1, "length can't be negative for write\n");
 +               }
++               if (length > kMaxLength) {
++                       errx(1, "write length too large\n");
++               }
 +
 +               if (offset < 0) {
 +                       // Sparse hole. Skip.
 +               } else {
-+                       ssize_t rc = pwrite(fd, buf, length, offset);
++                       ssize_t rc = pwrite(fd, buf, (size_t)length, (off_t)offset);
 +                       if (rc != length) {
 +                               errx(1, "write failed\n");
 +                       }
 +               }
 +               buf += length;
 +               new_size -= length;
 +       }
 +       if (new_size != 0) {
 +               errx(1, "output position length doesn't match new size\n");
 +       }
 +       close(fd);
 +}
 +
  static off_t offtin(u_char *buf)
  {
         off_t y;
-@@ -69,7 +301,13 @@ int main(int argc,char * argv[])
+@@ -69,7 +310,13 @@ int main(int argc,char * argv[])
         off_t lenread;
         off_t i;
  
 -       if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);
 +       if ((argc != 6) && (argc != 4)) {
 +               errx(1,"usage: %s oldfile newfile patchfile \\\n"
 +                       "  [in_offset,in_length,in_offset,in_length,... \\\n"
 +                       "  out_offset,out_length,"
 +                       "out_offset,out_length,...]\n",argv[0]);
 +       }
 +       int using_positioning = (argc == 6);
  
         /* Open patch file */
         if ((f = fopen(argv[3], "r")) == NULL)
-@@ -132,12 +370,18 @@ int main(int argc,char * argv[])
+@@ -132,12 +379,18 @@ int main(int argc,char * argv[])
         if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL)
                 errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err);
  
 -       if(((fd=open(argv[1],O_RDONLY,0))<0) ||
 -               ((oldsize=lseek(fd,0,SEEK_END))==-1) ||
 -               ((old=malloc(oldsize+1))==NULL) ||
 -               (lseek(fd,0,SEEK_SET)!=0) ||
 -               (read(fd,old,oldsize)!=oldsize) ||
 -               (close(fd)==-1)) err(1,"%s",argv[1]);
 +       // Read
 +
 +       if (!using_positioning) {
 +               if(((fd=open(argv[1],O_RDONLY,0))<0) ||
 +                       ((oldsize=lseek(fd,0,SEEK_END))==-1) ||
 +                       ((old=malloc(oldsize+1))==NULL) ||
 +                       (lseek(fd,0,SEEK_SET)!=0) ||
 +                       (read(fd,old,oldsize)!=oldsize) ||
 +                       (close(fd)==-1)) err(1,"%s",argv[1]);
 +       } else {
 +               old = PositionedRead(argv[1], argv[4], &oldsize);
 +       }
         if((new=malloc(newsize+1))==NULL) err(1,NULL);
  
         oldpos=0;newpos=0;
-@@ -193,9 +437,13 @@ int main(int argc,char * argv[])
+@@ -193,9 +446,13 @@ int main(int argc,char * argv[])
                 err(1, "fclose(%s)", argv[3]);
  
         /* Write the new file */
 -       if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) ||
 -               (write(fd,new,newsize)!=newsize) || (close(fd)==-1))
 -               err(1,"%s",argv[2]);
 +       if (!using_positioning) {
 +               if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) ||
 +                       (write(fd,new,newsize)!=newsize) || (close(fd)==-1))
 +                       err(1,"%s",argv[2]);
 +       } else {
 +               PositionedWrite(argv[2], argv[5], new, newsize);
 +       }
  
         free(new);
         free(old);
--- 
-1.6.4.4
-