fixed to segfault in connection to shoutcast

1 files changed, 8 insertions, 2 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 8b692ef..c744c6d 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -414,60 +414,66 @@ int LibMadPlugin::http_open(const QString& path ) {
 
     info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );
 
     qDebug("Stream info: " + info);
 
     return (tcp_sock);
 }
 
 
 
 bool LibMadPlugin::open( const QString& path ) {
     debugMsg( "LibMadPlugin::open" );
     Config cfg("MediaPlayer");
     cfg.setGroup("Options");
     bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
     qDebug("buffer size is %d", bufferSize);
     d->bad_last_frame = 0;
     d->flush = TRUE;
     info = QString( "" );
 
     //qDebug( "Opening %s", path.latin1() );
 
 
     if (path.left( 4 ) == "http" ) {
+        qDebug("Test2");
         // in case of any error we get 0 here
-        if ( !(http_open(path)==0) ) {
+        if ( !(http_open(path) == 0) ) {
+            qDebug("Test3");
             d->input.fd = http_open(path);
+        } else {
+            qDebug("Test5");
+            return FALSE;
         }
     } else {
+        qDebug("Test4");
         d->input.path = path.latin1();
         d->input.fd = ::open( d->input.path, O_RDONLY );
         // thats a better place, since it should only seek for ID3 tags on mp3 files, not streams
         printID3Tags();
     }
     if (d->input.fd == -1) {
-//        qDebug("error opening %s", d->input.path );
+        qDebug("error opening %s", d->input.path );
   return FALSE;
     }
 
 //    printID3Tags();
 
 #if defined(HAVE_MMAP)
     struct stat stat;
     if (fstat(d->input.fd, &stat) == -1) {
         //qDebug("error calling fstat"); return FALSE;
     }
     if (S_ISREG(stat.st_mode) && stat.st_size > 0) {
         d->input.length = stat.st_size;
         d->input.fdm = map_file(d->input.fd, &d->input.length);
         if (d->input.fdm == 0) {
             qDebug("error mmapping file"); return FALSE;
         }
         d->input.data = (unsigned char *)d->input.fdm;
     }
 #endif
 
     if (d->input.data == 0) {
         d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
         if (d->input.data == 0) {
             qDebug("error allocating input buffer");