[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kioslave/http
From:       Waldo Bastian <bastian () kde ! org>
Date:       2005-03-31 10:38:56
Message-ID: 20050331103856.F000A4A6 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Don't let infinite recursion crash the slave
BUG: 68955


  M +5 -2      http.cc   1.642


--- kdelibs/kioslave/http/http.cc  #1.641:1.642
@@ -2574,4 +2574,5 @@ void HTTPProtocol::forwardHttpResponseHe
 bool HTTPProtocol::readHeader()
 {
+try_again:
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::readHeader" << endl;
 
@@ -3428,5 +3429,5 @@ bool HTTPProtocol::readHeader()
       {
           m_request.bCachedRead = true;
-          return readHeader(); // Read header again, but now from cache.
+          goto try_again; // Read header again, but now from cache.
        }
        else
@@ -3446,5 +3447,5 @@ bool HTTPProtocol::readHeader()
   if ( cont )
   {
-    return readHeader();
+    goto try_again;
   }
   if ( m_responseCode == 204 )
@@ -4212,6 +4213,8 @@ bool HTTPProtocol::readBody( bool dataIn
     }
     else
+    {    
        totalSize ( 0 );
   }
+  }
   else
     infoMessage( i18n( "Retrieving from %1..." ).arg( m_request.hostname ) );


[prev in list] [next in list] [prev in thread] [next in thread]