X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fchart.c;h=e324901cc4df1d445f3fc8c7a4b64296bca55bca;hb=f7db18ef6a7e50bda368cf9a9288db58446f04c2;hp=9ae12f9c3105c600cea0a2bed692a8dea824908c;hpb=6b40f1315cf46ca2417c10ce08bcf62941bdd305;p=pspp-builds.git

diff --git a/src/output/chart.c b/src/output/chart.c
index 9ae12f9c..e324901c 100644
--- a/src/output/chart.c
+++ b/src/output/chart.c
@@ -29,12 +29,12 @@
 
 #include <plot.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/str.h>
 #include <output/manager.h>
 #include <output/output.h>
 
 #include "error.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -52,6 +52,7 @@ chart_create(void)
     return NULL;
 
   chart = xmalloc (sizeof *chart);
+  chart->lp = NULL;
   d->class->initialise_chart(d, chart);
   if (!chart->lp)
     {
@@ -82,6 +83,9 @@ chart_create(void)
   chart->legend_left = 810;
   chart->legend_right = 1000;
   chart->font_size = 0;
+  chart->in_path = false;
+  chart->dataset = NULL;
+  chart->n_datasets = 0;
   strcpy(chart->fill_colour,"red");
 
   /* Get default font size */
@@ -99,6 +103,7 @@ chart_create(void)
 void
 chart_submit(struct chart *chart)
 {
+  int i;
   struct som_entity s;
   struct outp_driver *d;
 
@@ -123,6 +128,11 @@ chart_submit(struct chart *chart)
 
   d = outp_drivers (NULL);
   d->class->finalise_chart(d, chart);
+
+  for (i = 0 ; i < chart->n_datasets; ++i)
+    free (chart->dataset[i]);
+  free (chart->dataset);
+
   free(chart);
 }