Changeset 469 for libcuefile/trunk/src/cue_parse.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/cue_parse.c (modified) (7 diffs)

libcuefile/trunk/src/cue_parse.c

@@ -1184 +1184 @@
   case 6:
 #line 115 "cue_parse.y"
-    { cd_set_catalog(cd, yyvsp[-1].sval); }
+    { cd_set_catalog(cd, yyvsp[-1].sval); free(yyvsp[-1].sval); }
     break;
 
   case 7:
 #line 116 "cue_parse.y"
-    { /* ignored */ }
+    { free(yyvsp[-1].sval); /* ignored */ }
     break;
 
@@ -1199 +1199 @@
                         free(new_filename);
                 }
-                new_filename = strdup(yyvsp[-2].sval);
+                new_filename = yyvsp[-2].sval; /*strdup(yyvsp[-2].sval);*/
         }
     break;
@@ -1212 +1212 @@
                 cdtext = track_get_cdtext(track);
 
-                cur_filename = new_filename;
-                if (NULL != cur_filename)
-                        prev_filename = cur_filename;
+                if (cur_filename) free(cur_filename);
+                cur_filename = new_filename ? strdup(new_filename) : 0;
+                if (NULL != cur_filename) {
+                        if (prev_filename) free(prev_filename);
+                        prev_filename = strdup(cur_filename);
+                }
 
                 if (NULL == prev_filename)
@@ -1221 +1224 @@
                         track_set_filename(track, prev_filename);
 
+                if (new_filename) free(new_filename);
                 new_filename = NULL;
         }
@@ -1234 +1238 @@
   case 34:
 #line 195 "cue_parse.y"
-    { track_set_isrc(track, yyvsp[-1].sval); }
+    { track_set_isrc(track, yyvsp[-1].sval); free(yyvsp[-1].sval); }
     break;
 
@@ -1278 +1282 @@
   case 46:
 #line 235 "cue_parse.y"
-    { cdtext_set (yyvsp[-2].ival, yyvsp[-1].sval, cdtext); }
+    { cdtext_set (yyvsp[-2].ival, yyvsp[-1].sval, cdtext); free(yyvsp[-1].sval); }
     break;
 
@@ -1519 +1523 @@
         yydebug = 0;
 
-        if (0 == yyparse())
-                return cd;
-
-        return NULL;
+        int error = yyparse();
+        cue_delete_buffer();
+        if (prev_filename) {
+                free(prev_filename);
+                prev_filename = 0;
+        }
+        if (cur_filename) {
+                free(cur_filename);
+                cur_filename = 0;
+        }
+        if (new_filename) {
+                free(new_filename);
+                new_filename = 0;
+        }
+
+        Cd *res = cd;
+        if (error) {
+                cd_delete(cd);
+                res = 0;
+        }
+        cd = 0;
+        track = 0;
+        prev_track = 0;
+        cdtext = 0;
+        return res;
 }