Attachment 1287 Details for Bug 1525 – tdepim 3.5.13.2 : fix kio_imap4 endless loop

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdepim 3.5.13.2 : fix kio_imap4 endless loop

tdepim-3.5.13.2-kio_imap_endless_loop.patch (text/plain), 4.44 KB, created by Francois Andriot on 2013-05-25 09:57:37 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-05-25 09:57:37 CDT

Size: 4.44 KB

patch

obsolete

>--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kioslaves/imap4/imap4.h.ORI	2013-05-25 16:28:16.525640273 +0200
>+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kioslaves/imap4/imap4.h	2013-05-25 16:28:43.709084199 +0200
>@@ -196,9 +196,6 @@
>   TQ_ULONG outputBufferIndex;
>   KIO::filesize_t mProcessedSize;
> 
>-  char readBuffer[IMAP_BUFFER];
>-  ssize_t readBufferLen;
>-  int readSize;
>   TQDateTime mTimeOfLastNoop;
> };
> 
>--- trinity-tdepim-3.5.13.2~pre23+6c74b892/kioslaves/imap4/imap4.cc.ORI	2013-05-25 16:28:52.509904201 +0200
>+++ trinity-tdepim-3.5.13.2~pre23+6c74b892/kioslaves/imap4/imap4.cc	2013-05-25 16:32:52.671998475 +0200
>@@ -167,9 +167,7 @@
> {
>   outputBufferIndex = 0;
>   mySSL = isSSL;
>-  readBuffer[0] = 0x00;
>   relayEnabled = false;
>-  readBufferLen = 0;
>   cacheOutput = false;
>   decodeContent = false;
>   mTimeOfLastNoop = TQDateTime();
>@@ -702,66 +700,61 @@
> 
> bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay)
> {
>-  if (myHost.isEmpty()) return FALSE;
>+  // FIXME (Serghei): i'm not sure about role of "relay"
> 
>-  while (true) {
>-    ssize_t copyLen = 0;
>-    if (readBufferLen > 0)
>-    {
>-      while (copyLen < readBufferLen && readBuffer[copyLen] != '\n') copyLen++;
>-      if (copyLen < readBufferLen) copyLen++;
>-      if (relay > 0)
>-      {
>-        TQByteArray relayData;
>+  if(myHost.isEmpty()) {
>+    return false;
>+  }
> 
>-        if (copyLen < (ssize_t) relay)
>-          relay = copyLen;
>-        relayData.setRawData (readBuffer, relay);
>-        parseRelay (relayData);
>-        relayData.resetRawData (readBuffer, relay);
>-//        kdDebug(7116) << "relayed : " << relay << "d" << endl;
>-      }
>-      // append to buffer
>-      {
>-        TQBuffer stream (buffer);
>+  // default error
>+  int errorStatus = ERR_CONNECTION_BROKEN;
> 
>-        stream.open (IO_WriteOnly);
>-        stream.at (buffer.size ());
>-        stream.writeBlock (readBuffer, copyLen);
>-        stream.close ();
>-//        kdDebug(7116) << "appended " << copyLen << "d got now " << buffer.size() << endl;
>-      }
>+  // open buffer stream
>+  TQBuffer stream(buffer);
>+  stream.open(IO_WriteOnly);
>+  stream.at(buffer.size());
> 
>-      readBufferLen -= copyLen;
>-      if (readBufferLen)
>-        memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
>-      if (buffer[buffer.size() - 1] == '\n') return TRUE;
>-    }
>+  for (;;)
>+  {
>     if (!isConnectionValid())
>     {
>       kdDebug(7116) << "parseReadLine - connection broken" << endl;
>-      error (ERR_CONNECTION_BROKEN, myHost);
>-      setState(ISTATE_CONNECT);
>-      closeConnection();
>-      return FALSE;
>+      break;
>     }
>-    if (!waitForResponse( responseTimeout() ))
>+
>+    if (!waitForResponse(responseTimeout()))
>     {
>-      error(ERR_SERVER_TIMEOUT, myHost);
>-      setState(ISTATE_CONNECT);
>-      closeConnection();
>-      return FALSE;
>+      kdDebug(7116) << "parseReadLine - connection timeout" << endl;
>+      errorStatus = ERR_SERVER_TIMEOUT;
>+      break;
>     }
>-    readBufferLen = read(readBuffer, IMAP_BUFFER - 1);
>-    if (readBufferLen == 0)
>+
>+    char buf[4096];
>+    int len = readLine(buf, sizeof(buf));
>+
>+    if (0 >= len)
>     {
>-      kdDebug(7116) << "parseReadLine: readBufferLen == 0 - connection broken" << endl;
>-      error (ERR_CONNECTION_BROKEN, myHost);
>-      setState(ISTATE_CONNECT);
>-      closeConnection();
>-      return FALSE;
>+      kdDebug(7116) << "parseReadLine - read line error" << endl;
>+      break;
>+    }
>+
>+    stream.writeBlock(buf, len);
>+
>+    // len is always bigger than zero,
>+    // is safe to substract it by 1
>+    if ('\n' == buf[len - 1])
>+    {
>+      stream.close();
>+      return true;
>     }
>   }
>+
>+  // error
>+  stream.close();
>+  error(errorStatus, myHost);
>+  setState(ISTATE_CONNECT);
>+  closeConnection();
>+  return false;
> }
> 
> void
>@@ -2009,7 +2002,6 @@
>   sentQueue.clear();
>   lastHandled = 0;
>   currentBox = TQString();
>-  readBufferLen = 0;
> }
> 
> bool IMAP4Protocol::makeLogin ()
>@@ -2653,16 +2645,14 @@
> 
> ssize_t IMAP4Protocol::myRead(void *data, ssize_t len)
> {
>-  if (readBufferLen)
>-  {
>-    ssize_t copyLen = (len < readBufferLen) ? len : readBufferLen;
>-    memcpy(data, readBuffer, copyLen);
>-    readBufferLen -= copyLen;
>-    if (readBufferLen) memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
>-    return copyLen;
>+  if (!isConnectionValid()) {
>+    return 0;
>+  }
>+
>+  if (!waitForResponse(responseTimeout())) {
>+    return 0;
>   }
>-  if (!isConnectionValid()) return 0;
>-  waitForResponse( responseTimeout() );
>+  
>   return read(data, len);
> }
>

Actions: View | Diff

Attachments on bug 1525: 1287 | 1288 | 1291 | 1292 | 1293 | 2226 | 2227