summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-01 09:01:41 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-01 09:01:41 +0000
commit46630a96a93494178f58f838337944313605966a (patch)
treefa70d7b94581bfaa4625dc67bc88d0518ce61003 /subreader.c
parent0ff088813f7061d60f134874c0c3b8f170ebed4e (diff)
downloadmpv-46630a96a93494178f58f838337944313605966a.tar.bz2
mpv-46630a96a93494178f58f838337944313605966a.tar.xz
strdup subtitle filename at a more appropriate place, fixing memleaks and
double frees. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15604 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/subreader.c b/subreader.c
index 9d5486e3ee..e2cdb674dc 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1350,7 +1350,6 @@ void* guess_cp(FILE *fd, char *preferred_language, char *fallback)
#endif
sub_data* sub_read_file (char *filename, float fps) {
- //filename is assumed to be malloc'ed, free() is used in sub_free()
FILE *fd;
int n_max, n_first, i, j, sub_first, sub_orig;
subtitle *first, *second, *sub, *return_sub;
@@ -1718,7 +1717,7 @@ if ((suboverlap_enabled == 2) ||
}
if (return_sub == NULL) return NULL;
subt_data = (sub_data *)malloc(sizeof(sub_data));
- subt_data->filename = filename;
+ subt_data->filename = strdup(filename);
subt_data->sub_uses_time = uses_time;
subt_data->sub_num = sub_num;
subt_data->sub_errs = sub_errs;