diff options
| author | phintuka <phintuka> | 2009-06-04 13:16:37 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2009-06-04 13:16:37 +0000 |
| commit | 1bb1af3d9efcf74d5093fc7825868807dfd8bb18 (patch) | |
| tree | 422e859c03f80d338fd747197fd2f0e85ff8b93f | |
| parent | e8686238a79e1db1c8f868455a9db2b0eacd8e07 (diff) | |
| download | xineliboutput-unlabeled-1.56.2.tar.gz xineliboutput-unlabeled-1.56.2.tar.bz2 | |
Merge from trunk:unlabeled-1.56.2
revision 1.70
date: 2009/05/29 15:09:10; author: phintuka; state: Exp; lines: +2 -2
Fixed invalid cast
| -rw-r--r-- | frontend_svr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/frontend_svr.c b/frontend_svr.c index d0f07b61..93ccdeab 100644 --- a/frontend_svr.c +++ b/frontend_svr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_svr.c,v 1.56.2.4 2009-02-12 11:14:15 phintuka Exp $ + * $Id: frontend_svr.c,v 1.56.2.5 2009-06-04 13:16:37 phintuka Exp $ * */ @@ -1332,11 +1332,12 @@ void cXinelibServer::Handle_Control_HTTP(int cli, const char *arg) else if(!strncmp(m_State[cli]->Uri(), "/PLAYFILE", 9)) { if( *m_FileName && m_bPlayingFile) { - char *pos = strstr(m_FileName, "#subtitle:"); - if(pos) *pos = 0; - bool Allow = ( !strcmp_escaped(m_FileName, m_State[cli]->Uri() + 9) + cString file = m_FileName; + const char *pos = strstr(m_FileName, "#subtitle:"); + if(pos) + file.Truncate(pos - m_FileName); + bool Allow = ( !strcmp_escaped(file, m_State[cli]->Uri() + 9) || (pos && !strcmp_escaped(pos + 10, m_State[cli]->Uri() + 9))); - if(pos) *pos = '#'; if(Allow) { LOGMSG("HTTP streaming media file"); |