Changeset 469 for libcuefile/trunk/src/cd.c

Timestamp:

06/18/11 14:28:43 (13 years ago)

Author:

r2d

Message:

patch by Markus Peloquin <markus@…> :
Fixed the copious memory leaks in libcuefile and changed the headers
so C++ could use it.

File:

• libcuefile/trunk/src/cd.c (modified) (2 diffs)

libcuefile/trunk/src/cd.c

@@ -59 +59 @@
 }
 
+void track_delete(Track *track)
+{
+        if (track->isrc)
+                free(track->isrc);
+        if (track->cdtext)
+                cdtext_delete(track->cdtext);
+        if (track->zero_pre.name)
+                free(track->zero_pre.name);
+        if (track->file.name)
+                free(track->file.name);
+        if (track->zero_post.name)
+                free(track->zero_post.name);
+        free(track);
+}
+
+void cd_delete (Cd *cd)
+{
+        size_t i;
+        if (cd->cdtext)
+                cdtext_delete(cd->cdtext);
+        if (cd->catalog)
+                free(cd->catalog);
+        for (i = 0; i < cd->ntrack; i++)
+                track_delete(cd->track[i]);
+        free(cd);
+}
+
 Track *track_init ()
 {
@@ -128 +155 @@
         if (MAXTRACK - 1 > cd->ntrack)
                 cd->ntrack++;
-        else
+        else {
                 fprintf(stderr, "too many tracks\n");
+                track_delete(cd->track[cd->ntrack - 1]);
+        }
 
         /* this will reinit last track if there were too many */