ascii: Avoid buffer overread outputting page longer than allocated lines.

[pspp] / src / output / table-item.c

diff --git a/src/output/table-item.c b/src/output/table-item.c
index 1308cb86503cddd887354bbdac1d13c9c6798555..e9b854040a823982c36ac96690f7594c9a3a90b0 100644 (file)
--- a/src/output/table-item.c
+++ b/src/output/table-item.c
@@ -35,8 +35,7 @@ table_item_text_create (const char *content)
     return NULL;
 
   struct table_item_text *text = xmalloc (sizeof *text);
-  *text = (struct table_item_text) { .content = xstrdup (content),
-                                     .halign = TAB_LEFT };
+  *text = (struct table_item_text) { .content = xstrdup (content) };
   return text;
 }
 
@@ -52,8 +51,7 @@ table_item_text_clone (const struct table_item_text *old)
     .footnotes = xmemdup (old->footnotes,
                           old->n_footnotes * sizeof *old->footnotes),
     .n_footnotes = old->n_footnotes,
-    .style = cell_style_clone (NULL, old->style),
-    .halign = old->halign,
+    .style = area_style_clone (NULL, old->style),
   };
   return new;
 }
@@ -65,7 +63,7 @@ table_item_text_destroy (struct table_item_text *text)
     {
       free (text->content);
       free (text->footnotes);
-      cell_style_free (text->style);
+      area_style_free (text->style);
       free (text);
     }
 }
@@ -179,5 +177,6 @@ table_item_destroy (struct output_item *output_item)
 
 const struct output_item_class table_item_class =
   {
+    "table",
     table_item_destroy,
   };