address some more memory management problems, see #37 (comment)

Author: bruceravel

c/README.md

@@ -73,6 +73,7 @@ to the screen:
 		printf("Error reading XDI file '%s':\n     %s\t(error code = %ld)\n",
 			argv[1], xdifile->error_message, ret);
 		XDI_cleanup(xdifile, ret);
+		free(xdifile);
 		return 1;
 	}
 
@@ -168,6 +169,7 @@ To deallocate the memory from the XDIFile struct, do this:
 
 ```C
 	XDI_cleanup(xdifile, ret);
+	free(xdifile);
 ```
 
 Here, the second argument is the return code from the call to

c/xdi_reader.c

@@ -39,6 +39,7 @@ int main(int argc, char **argv) {
     printf("Error reading XDI file '%s':\n     %s\t(error code = %ld)\n",
 	   argv[1], xdifile->error_message, ret);
     XDI_cleanup(xdifile, ret);
+    free(xdifile);
     return 1;
   }
 
@@ -106,5 +107,6 @@ int main(int argc, char **argv) {
   /* free memory before leaving */
   free(tdat);
   XDI_cleanup(xdifile, 0);
+  free(xdifile);
   return 0;
 }

c/xdifile.c

@@ -972,7 +972,7 @@ XDI_cleanup(XDIFile *xdifile, long err) {
       (err != ERR_META_KEYNAME) &&
       (err != ERR_META_FORMAT))    {
     free(xdifile->filename);
-  };
+  }
 
   if ((err < -1) || (err == 0)) {
 
@@ -985,7 +985,7 @@ XDI_cleanup(XDIFile *xdifile, long err) {
       free(xdifile->array);
       free(xdifile->array_labels);
       free(xdifile->array_units);
-    };
+    }
 
     for (j = 0; j < xdifile->nmetadata; j++) {
       free(xdifile->meta_families[j]);
@@ -1003,8 +1003,6 @@ XDI_cleanup(XDIFile *xdifile, long err) {
     if (err == 0) {
       free(xdifile->outer_array);
       free(xdifile->outer_breakpts);
-    };
+    }
   }
-
-  free(xdifile);
 }

perl/lib/Xray/XDI.pm

@@ -19,7 +19,7 @@ has 'file' => (is => 'rw', isa => 'Str', traits => [qw(Clone)], default => q{},
 has 'xdifile' => (
 		  is        => 'ro',
 		  traits => [qw(NoClone)],
-		  isa       => 'Xray::XDIFile',
+		  #isa       => 'Xray::XDIFile'|'Undef',
 		  init_arg  => undef,
 		  lazy      => 1,
 		  builder   => '_build_object',
@@ -72,22 +72,32 @@ has 'data'           => (
 				      },
 			);
 
+sub DEMOLISH {
+  my ($self) = @_;
+  return if $self->errorcode;	# is this right?  or does the errorcode need to be passed to _cleanup?
+  return if not defined($self->xdifile);
+  $self->xdifile->_cleanup(0);
+};
+
 sub _build_object {
   my ($self) = @_;
   $self->error(q{});
   $self->ok(1);
   $self->warning(0);
   if (not -e $self->file) {
+    $self->errorcode(1);
     $self->error('The file '.$self->file.' does not exist as XDI');
     $self->ok(0);
     return undef;
   };
   if (not -r $self->file) {
+    $self->errorcode(1);
     $self->error('The file '.$self->file.' cannot be read as XDI');
     $self->ok(0);
     return undef;
   };
   if (-d $self->file) {
+    $self->errorcode(1);
     $self->error($self->file.' is a folder (i.e. not an XDI file)');
     $self->ok(0);
     return undef;