dump: Title section sometimes has 0x31 plus fixed block in place of 0x58.

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index a600e41ae772ec15b72cc18727fa5b2b9efce15f..140050d6cba84956d5bd32ff594f2d7fe1baa664 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -267,6 +267,7 @@ dump_value_31(FILE *stream)
           if (match_byte(0x31))
             {
               /* Only one example in the corpus. */
+              match_byte(1);
               match_byte(0);
               match_byte(0);
               match_byte(0);
@@ -274,11 +275,30 @@ dump_value_31(FILE *stream)
               get_string();     /* foreground */
               get_string();     /* background */
               get_string();     /* font */
-              match_byte_assert(12); /* size? */
+              if (!match_byte(14))
+                match_byte_assert(12); /* size? */
+            }
+          else
+            match_byte_assert(0x58);
+          if (match_byte(0x31))
+            {
+              /* All the examples in the corpus, all from one SPV file, are
+                 exactly like this. */
+              match_u32_assert(0);
+              match_u32_assert(0);
+              match_u32_assert(0);
+              match_u32_assert(0);
+              match_byte_assert(1);
+              match_byte_assert(0);
+              match_byte_assert(8);
+              match_byte_assert(0);
+              match_byte_assert(8);
+              match_byte_assert(0);
+              match_byte_assert(10);
+              match_byte_assert(0);
             }
           else
             match_byte_assert(0x58);
-          match_byte_assert(0x58);
           if (pos != outer_end)
             {
               fprintf(stderr, "outer end discrepancy\n");
@@ -757,8 +777,8 @@ dump_fonts(void)
   match_byte_assert(0);
   if (!match_byte(0))
     match_byte_assert(1);
-  if (!match_byte(0x99) && !match_byte(0x98))
-    match_byte_assert(0x97);
+  if (!match_byte(0x97) && !match_byte(0x98) && !match_byte(0x99))
+    match_byte_assert(0x9a);
   match_byte_assert(7);
   match_byte_assert(0);
   match_byte_assert(0);