[MPlayer-dev-eng] [PATCH] make sub_read_file strdup the filename
Reimar Döffinger
Reimar.Doeffinger at stud.uni-karlsruhe.de
Fri May 27 17:39:45 CEST 2005
Hi,
On Fri, May 27, 2005 at 04:57:38PM +0200, Reimar D?ffinger wrote:
> since it is at the moment use incorrectly in mplayer.c and even in its
> own "sample" code in subreader.c (not to mention that I hate the current
> semantics), this patch makes sub_read_file strdup the filename for
> storing it in subt_data.
> It will make the memleak in mencoder.c a tiny bit bigger (where in
> addition was also used incorrectly before well by passing "default"),
> but compared to the leak caused by not freeing the results of get_path
> and sub_filenames that's negligable.
Fixed that memleak.
Greetings,
Reimar Döffinger
-------------- next part --------------
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.287
diff -u -r1.287 mencoder.c
--- mencoder.c 24 May 2005 19:46:44 -0000 1.287
+++ mencoder.c 27 May 2005 15:33:47 -0000
@@ -591,8 +591,17 @@
if(!subdata) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name[0]);
} else
if(sub_auto) { // auto load sub file ...
- subdata=sub_read_file( filename ? sub_filenames( get_path("sub/"), filename )[0]
- : "default.sub", sh_video->fps );
+ char **tmp = NULL;
+ int i = 0;
+ if (filename) {
+ char *psub = get_path( "sub/" );
+ tmp = sub_filenames((psub ? psub : ""), filename);
+ free(psub);
+ }
+ subdata=sub_read_file( tmp[0] ? tmp[0] : "default.sub", sh_video->fps );
+ while (tmp[i])
+ free(tmp[i++]);
+ free(tmp);
}
#endif
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.845
diff -u -r1.845 mplayer.c
--- mplayer.c 18 May 2005 11:38:05 -0000 1.845
+++ mplayer.c 27 May 2005 15:33:47 -0000
@@ -1914,18 +1914,18 @@
if(sub_auto) { // auto load sub file ...
char *psub = get_path( "sub/" );
char **tmp = sub_filenames((psub ? psub : ""), filename);
- char **tmp2 = tmp;
+ int i = 0;
free(psub); // release the buffer created by get_path() above
- while (*tmp2)
- add_subtitles (*tmp2++, sh_video->fps, 0);
+ while (tmp[i]) {
+ add_subtitles (tmp[i], sh_video->fps, 0);
+ free(tmp[i++]);
+ }
free(tmp);
if (set_of_sub_size == 0)
{
add_subtitles (mem_ptr=get_path("default.sub"), sh_video->fps, 1);
free(mem_ptr); // release the buffer created by get_path()
}
- if (set_of_sub_size > 0)
- add_subtitles (NULL, sh_video->fps, 1);
}
if (set_of_sub_size > 0) {
// setup global sub numbering
Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.143
diff -u -r1.143 subreader.c
--- subreader.c 24 May 2005 08:42:20 -0000 1.143
+++ subreader.c 27 May 2005 15:33:48 -0000
@@ -1350,7 +1350,6 @@
#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 (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;
Index: Gui/interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.104
diff -u -r1.104 interface.c
--- Gui/interface.c 12 Feb 2005 16:05:10 -0000 1.104
+++ Gui/interface.c 27 May 2005 15:33:48 -0000
@@ -486,7 +486,7 @@
if ( name )
{
mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_LoadingSubtitles,name );
- subdata=sub_read_file( gstrdup( name ), guiIntfStruct.FPS );
+ subdata=sub_read_file( name, guiIntfStruct.FPS );
if ( !subdata ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name );
sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted
sub_name[0] = strdup(name); //sub_name[0] will be read
More information about the MPlayer-dev-eng
mailing list