Fix numerous memory leaks.

[pspp] / src / output / odt.c

diff --git a/src/output/odt.c b/src/output/odt.c
index f0143515e0aac73f6a18aff018901ecc2e416a9a..90a76186a7d81f7cdedd7f8510388aa30a0306ae 100644 (file)
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -40,7 +40,6 @@
 #include "output/driver-provider.h"
 #include "output/message-item.h"
 #include "output/options.h"
-#include "output/tab.h"
 #include "output/table-item.h"
 #include "output/table-provider.h"
 #include "output/text-item.h"
@@ -57,6 +56,7 @@ struct odt_driver
   struct output_driver driver;
 
   struct zip_writer *zip;     /* ZIP file writer. */
+  struct file_handle *handle; /* Handle for 'file_name'. */
   char *file_name;            /* Output file name. */
 
   /* content.xml */
@@ -303,6 +303,7 @@ odt_create (struct file_handle *fh, enum settings_output_devices device_type,
   output_driver_init (d, &odt_driver_class, file_name, device_type);
 
   odt->zip = zip;
+  odt->handle = fh;
   odt->file_name = xstrdup (file_name);
 
   if (!create_mimetype (zip))
@@ -380,6 +381,7 @@ odt_destroy (struct output_driver *driver)
       zip_writer_close (odt->zip);
     }
 
+  fh_unref (odt->handle);
   free (odt->file_name);
   free (odt);
 }
@@ -496,7 +498,6 @@ write_table (struct odt_driver *odt, const struct table_item *item)
       for (c = 0 ; c < table_nc (tab) ; ++c)
        {
           struct table_cell cell;
-          size_t i;
 
           table_get_cell (tab, c, r, &cell);
 
@@ -518,34 +519,27 @@ write_table (struct odt_driver *odt, const struct table_item *item)
                   odt->content_wtr, _xml("table:number-rows-spanned"),
                   "%d", rowspan);
 
-              for (i = 0; i < cell.n_contents; i++)
+              xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
+
+              if ( r < table_ht (tab) || c < table_hl (tab) )
+                xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading"));
+              else
+                xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents"));
+
+              if (cell.options & TAB_MARKUP)
                 {
-                  const struct cell_contents *contents = &cell.contents[i];
-                  int j;
-
-                  xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
-
-                  if ( r < table_ht (tab) || c < table_hl (tab) )
-                    xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading"));
-                  else
-                    xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents"));
-
-                  if (contents->options & TAB_MARKUP)
-                    {
-                      /* XXX */
-                      char *s = output_get_text_from_markup (
-                        contents->text);
-                      write_xml_with_line_breaks (odt, s);
-                      free (s);
-                    }
-                  else
-                    write_xml_with_line_breaks (odt, contents->text);
-
-                  for (j = 0; j < contents->n_footnotes; j++)
-                    write_footnote (odt, contents->footnotes[j]);
-
-                  xmlTextWriterEndElement (odt->content_wtr); /* text:p */
+                  /* XXX */
+                  char *s = output_get_text_from_markup (cell.text);
+                  write_xml_with_line_breaks (odt, s);
+                  free (s);
                 }
+              else
+                write_xml_with_line_breaks (odt, cell.text);
+
+              for (int i = 0; i < cell.n_footnotes; i++)
+                write_footnote (odt, cell.footnotes[i]);
+
+              xmlTextWriterEndElement (odt->content_wtr); /* text:p */
               xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */
            }
          else