Fix more.

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index 24804ea13d3e9f31453d1f4aa58854d701b8d084..faea74221ccc7b2d660829b9cf6c2c952d9ce5b0 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -237,8 +237,8 @@ dump_value(int level)
       vallab = get_string ();
       printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
-      if (!match_u32 (3))
-        match_u32_assert (2);
+      if (!match_u32 (1) && !match_u32(2))
+        match_u32_assert (3);
       match_byte (0);
       match_byte (0);
       match_byte (0);
@@ -253,7 +253,8 @@ dump_value(int level)
       format = get_u32 ();
       vallab = get_string ();
       var = get_string ();
-      match_byte_assert (2);
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert (3);
       value = get_string ();
       printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
@@ -446,7 +447,8 @@ dump_category(int level)
   else if (match_byte (1))
     {
       match_byte (0);
-      match_u32_assert (1);
+      if (!match_u32 (2))
+        match_u32_assert (1);
       match_byte (0);
       get_u32();
     }
@@ -534,10 +536,13 @@ dump_dim(void)
         }
     }
 
-  match_byte_assert(0);
+  /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
+  pos++;
+
   if (!match_byte(0) && !match_byte(1))
     match_byte_assert(2);
-  match_u32_assert(2);
+  if (!match_u32(0))
+    match_u32_assert(2);
   if (!match_byte(0))
     match_byte_assert(1);
   match_byte(0);