Fixed some memory allocation issues

[pspp] / src / data / ods-reader.c

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 158a2735aca501ac69cedd727d193e086e3d3749..fe9b90049b262f98dcb6de7931ef7e8217a0fcf0 100644 (file)
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -117,12 +117,10 @@ struct ods_reader
   int target_sheet_index;
 
 
-#if 1
   int start_row;
   int start_col;
   int stop_row;
   int stop_col;
-#endif
 
   int col_span;
 
@@ -161,17 +159,19 @@ static void process_node (struct ods_reader *r);
 const char *
 ods_get_sheet_name (struct spreadsheet *s, int n)
 {
-  int ret;
   struct ods_reader *or = (struct ods_reader *) s;
   
   assert (n < s->n_sheets);
 
   while ( 
-        (or->n_allocated_sheets <= n)
-        && 
-        (1 == (ret = xmlTextReaderRead (or->xtr)))
+         (or->n_allocated_sheets <= n)
+         || or->state != STATE_SPREADSHEET
          )
     {
+      int ret = xmlTextReaderRead (or->xtr);
+      if ( ret != 1)
+       break;
+
       process_node (or);
     }
 
@@ -181,23 +181,23 @@ ods_get_sheet_name (struct spreadsheet *s, int n)
 char *
 ods_get_sheet_range (struct spreadsheet *s, int n)
 {
-  int ret = -1;
   struct ods_reader *or = (struct ods_reader *) s;
   
   assert (n < s->n_sheets);
 
   while ( 
-        (
          (or->n_allocated_sheets <= n)
-         || (or->sheets[n].stop_row == -1) )
-        && 
-        (1 == (ret = xmlTextReaderRead (or->xtr)))
+         || (or->sheets[n].stop_row == -1) 
+         || or->state != STATE_SPREADSHEET
          )
     {
+      int ret = xmlTextReaderRead (or->xtr);
+      if ( ret != 1)
+       break;
+
       process_node (or);
     }
 
-
   return create_cell_ref (
                          or->sheets[n].start_col,
                          or->sheets[n].start_row,
@@ -263,12 +263,13 @@ process_node (struct ods_reader *r)
 
          if (r->current_sheet >= r->n_allocated_sheets)
            {
+             assert (r->current_sheet == r->n_allocated_sheets);
              r->sheets = xrealloc (r->sheets, sizeof (*r->sheets) * ++r->n_allocated_sheets);
              r->sheets[r->n_allocated_sheets - 1].start_col = -1;
              r->sheets[r->n_allocated_sheets - 1].stop_col = -1;
              r->sheets[r->n_allocated_sheets - 1].start_row = -1;
              r->sheets[r->n_allocated_sheets - 1].stop_row = -1;
-             r->sheets[r->n_allocated_sheets - 1].name = xmlStrdup (r->current_sheet_name);
+             r->sheets[r->n_allocated_sheets - 1].name = CHAR_CAST (char *, xmlStrdup (r->current_sheet_name));
            }
 
          r->col = 0;
@@ -305,7 +306,6 @@ process_node (struct ods_reader *r)
        }
       break;
     case STATE_ROW:
-      //      printf ("%s:%d Name is %s\n", __FILE__, __LINE__, name);
       if ( (0 == xmlStrcasecmp (name, _xml ("table:table-cell")))
           && 
           (XML_READER_TYPE_ELEMENT  == r->node_type))
@@ -317,10 +317,10 @@ process_node (struct ods_reader *r)
          r->col_span = value ? _xmlchar_to_int (value) : 1;
          r->col += r->col_span;
 
-         //      printf ("%s:%d %s\n", __FILE__, __LINE__, value);
-
          if (! xmlTextReaderIsEmptyElement (r->xtr))
            r->state = STATE_CELL;
+
+         xmlFree (value);
        }
       else if ( (0 == xmlStrcasecmp (name, _xml ("table:table-row")))
                &&
@@ -441,7 +441,7 @@ convert_xml_to_value (struct ccase *c, const struct variable *var,
 
       if ( 0 == xmlStrcmp (xmv->type, _xml("float")))
        {
-         v->f = c_strtod (xmv->value, NULL);
+         v->f = c_strtod (CHAR_CAST (const char *, xmv->value), NULL);
        }
       else
        {
@@ -480,14 +480,21 @@ get_sheet_count (struct zip_reader *zreader)
       if ( 0 == xmlStrcmp (name, _xml("meta:document-statistic")))
        {
          xmlChar *attr = xmlTextReaderGetAttribute (mxtr, _xml ("meta:table-count"));
-           
+
          if ( attr != NULL)
            {
              int s = _xmlchar_to_int (attr);
+             xmlFreeTextReader (mxtr);
+             xmlFree (name);
+             xmlFree (attr);      
              return s;
            }
+         xmlFree (attr);      
        }
+      xmlFree (name);      
     }
+
+  xmlFreeTextReader (mxtr);
   return -1;
 }
 
@@ -527,6 +534,10 @@ init_reader (struct ods_reader *r, bool report_errors)
 
   r->xtr = xtr;
   r->spreadsheet.type = SPREADSHEET_ODS;
+  r->row = 0;
+  r->col = 0;
+  r->current_sheet = 0;
+  r->state = STATE_INIT;
 
   if (report_errors) 
     xmlTextReaderSetErrorHandler (xtr, ods_error_handler, r);
@@ -646,7 +657,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
       process_node (r);
     }
 
-
   if (ret < 1)
     {
       msg (MW, _("Selected sheet or range of spreadsheet `%s' is empty."),
@@ -674,8 +684,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
          if (r->stop_col != -1 && idx > r->stop_col - r->start_col)
            continue;
 
-         //      printf ("%s:%d IDX %d COL %d\n", __FILE__, __LINE__, idx, r->col);
-
          if (r->state == STATE_CELL_CONTENT 
              &&
              XML_READER_TYPE_TEXT  == r->node_type)
@@ -689,7 +697,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
                  /* xrealloc (unlike realloc) doesn't initialise its memory to 0 */
                  memset (var_spec + n_var_specs,
                          0, 
-                         (n_var_specs - idx + 1) * sizeof (*var_spec));
+                         (idx - n_var_specs + 1) * sizeof (*var_spec));
                  n_var_specs = idx + 1;
                }
              var_spec[idx].firstval.text = 0;
@@ -698,8 +706,6 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
              var_spec [idx].name = strdup (CHAR_CAST (const char *, value));
 
-             //              printf ("%s:%d Name %s\n", __FILE__, __LINE__, var_spec [idx].name);
-
              xmlFree (value);
            }
        }
@@ -711,6 +717,9 @@ ods_make_reader (struct spreadsheet *spreadsheet,
       int idx;
       process_node (r);
 
+      if ( ! reading_target_sheet (r) )
+       break;
+
       /* If the row is finished then stop for now */
       if (r->state == STATE_TABLE &&
          r->row > r->start_row + (opts->read_names ? 1 : 0))
@@ -744,20 +753,18 @@ ods_make_reader (struct spreadsheet *spreadsheet,
          if (idx >= n_var_specs)
            {
              var_spec = xrealloc (var_spec, sizeof (*var_spec) * (idx + 1));
+             memset (var_spec + n_var_specs,
+                     0, 
+                     (idx - n_var_specs + 1) * sizeof (*var_spec));
+
              var_spec [idx].name = NULL;
              n_var_specs = idx + 1;
            }
-#if 0
-         printf ("%s:%d Idx %d n_var_specs %d\n", __FILE__, __LINE__,
-                 idx, n_var_specs);
-#endif
-           
+
          var_spec [idx].firstval.type = type;
          var_spec [idx].firstval.text = xmlTextReaderValue (r->xtr);
          var_spec [idx].firstval.value = val_string;
 
-         //      printf ("%s:%d Text %s\n", __FILE__, __LINE__, var_spec [idx].firstval.text);
-
          val_string = NULL;
          type = NULL;
        }
@@ -821,9 +828,8 @@ ods_make_reader (struct spreadsheet *spreadsheet,
        break;
     }
 
-  //  zip_reader_destroy (zreader);
+  // zip_reader_destroy (zreader);
 
-#if 0
   for ( i = 0 ; i < n_var_specs ; ++i )
     {
       free (var_spec[i].firstval.type);
@@ -833,7 +839,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
     }
 
   free (var_spec);
-#endif
+
 
   return casereader_create_sequential
     (NULL,
@@ -843,7 +849,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
 
  error:
   
-  // zip_reader_destroy (zreader);
+  //zip_reader_destroy (zreader);
 
   for ( i = 0 ; i < n_var_specs ; ++i )
     {
@@ -927,18 +933,20 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 
          for (col = 0; col < r->col_span; ++col)
            {
+             const struct variable *var;
              const int idx = r->col + col - r->start_col - 1;
              if (idx < 0)
                continue;
              if (r->stop_col != -1 && idx > r->stop_col - r->start_col )
                break;
 
-             const struct variable *var = dict_get_var (r->dict, idx);
+              var = dict_get_var (r->dict, idx);
              convert_xml_to_value (c, var, xmv);
            }
 
-         free (xmv->text);
-         free (xmv->value);
+         xmlFree (xmv->text);
+         xmlFree (xmv->value);
+         xmlFree (xmv->type);
          free (xmv);
        }
       if ( r->state <= STATE_TABLE)