From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Wed, 15 Jun 2011 21:21:43 +0000 (+0100)
Subject: More sensible type choices.  Making remain be size_t would limit to 4G
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ee2905c89a4955a8211c19248762b1f1ce8ed5b4;p=vbig.git

More sensible type choices.  Making remain be size_t would limit to 4G
on a 32-bit system!
---

diff --git a/vbig.cc b/vbig.cc
index 3862e5b..190dbf0 100644
--- a/vbig.cc
+++ b/vbig.cc
@@ -129,9 +129,9 @@ int main(int argc, char **argv) {
   if(mode == VERIFY && flush)
     flushCache(fp);
   char generated[4096], input[4096];
-  size_t remain = size;
+  long long remain = size;
   while(remain > 0) {
-    size_t bytesGenerated = (remain > sizeof generated
+    size_t bytesGenerated = (remain > (ssize_t)sizeof generated
                              ? sizeof generated
                              : remain);
     rng.stream(generated, bytesGenerated);