1 files changed, 5 insertions, 4 deletions

diff --git a/dis/original/Field/field.c b/dis/original/Field/field.c
index a561f72..8565e8c 100644
--- a/dis/original/Field/field.c
+++ b/dis/original/Field/field.c
@@ -22,7 +22,7 @@
 
 
 #define MIN_FIELD_SIZE 16
-#define MAX_FIELD_SIZE 16777216
+#define MAX_FIELD_SIZE (16777216*4) // This has been quadrupled from original
 #define MIN_SEED -2147483647
 #define MAX_SEED -1
 #define MIN_MOD_OFFSET 0
@@ -62,7 +62,7 @@ int main(int argc, char** argv){
 
   unsigned int l;
 
-  fscanf(stdin, "%d %d %d %d", &f, &seed, &mod_offset, &n);
+  assert(fscanf(stdin, "%d %d %d %d", &f, &seed, &mod_offset, &n) == 4);
 
   assert((f >= MIN_FIELD_SIZE) && (f <= MAX_FIELD_SIZE));
   assert((seed >= MIN_SEED) && (seed <= MAX_SEED));
@@ -72,12 +72,12 @@ int main(int argc, char** argv){
       int x;
       int index;
       index = 0;
-      fscanf(stdin,"%x", &x);
+      assert(fscanf(stdin,"%x", &x) == 1);
       while(x!=0){
         assert((x >= MIN_TOKEN_VALUE) && (x <= MAX_TOKEN_VALUE));
           token[l].delimiter[index] = (unsigned char )x;
         index++;
-        fscanf(stdin,"%x", &x);
+        assert(fscanf(stdin,"%x", &x) == 1);
       }
       assert((index >= MIN_TOKEN_LENGTH) && (index <= MAX_TOKEN_LENGTH));
         token[l].length = index;
@@ -132,6 +132,7 @@ int main(int argc, char** argv){
         }            
         index++;
     }
+    token[l].subfields++;
     STOP_LOOP
     }