[Mplayer-cvslog] CVS: main mplayer.c,1.303,1.304

Megyer Laszlo laaz at mplayer.dev.hu
Fri Oct 26 22:48:47 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv11110

Modified Files:
	mplayer.c 
Log Message:
Fixed segfault if 0 subtitle found in a file.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- mplayer.c	24 Oct 2001 10:57:59 -0000	1.303
+++ mplayer.c	26 Oct 2001 20:48:22 -0000	1.304
@@ -607,7 +607,8 @@
 		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
 	  sub_utf8=1;
        subtitles=sub_read_file(sub_name);
-       if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
+       if (sub_num == 0) printf ("No subtitles found in %s\n",sub_name);
+       if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
   }
 #endif
 




More information about the MPlayer-cvslog mailing list