Changeset 538

Timestamp:

04/30/06 14:46:21 (3 years ago)

Author:

common

Message:

nepenthes
- vuln-{bagle,mydoom} fixes bad return values when the connection is closed, which lead to an endless loop eating all your memory

Files:

• nepenthes/trunk/modules/vuln-bagle/BagleDialogue.cpp (modified) (3 diffs)
• nepenthes/trunk/modules/vuln-mydoom/MydoomDialogue.cpp (modified) (3 diffs)

nepenthes/trunk/modules/vuln-bagle/BagleDialogue.cpp

@@ -159 +159 @@
-                                m_Download = new Download(m_Socket->getRemoteHost(),"bagle://",m_Socket->getRemoteHost(),"bagle://foo/bar");
-                                m_Download->getDownloadBuffer()->addData(msg->getMsg()+4,msg->getSize()-4);
+                                return CL_ASSIGN_AND_DONE;
-                        }
-                }
@@ -166 +167 @@
-                // FIXME m_MaxFileSize
-                m_Download->getDownloadBuffer()->addData(msg->getMsg(),msg->getSize());
+                return CL_ASSIGN_AND_DONE;
-                break;
-
@@ -233 +235 @@
-                {
-                        g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
-                        // destructor will delete it
-                        return CL_ASSIGN_AND_DONE;
-                }
-        }

nepenthes/trunk/modules/vuln-mydoom/MydoomDialogue.cpp

@@ -121 +121 @@
-                                m_Download->getDownloadBuffer()->addData((char *)m_Buffer->getData(),m_Buffer->getSize());
-                                m_Buffer->clear();
-
+_AND_DONE
-                        }
-                }
@@ -131 +131 @@
-                {
-                        m_Download->getDownloadBuffer()->addData((char *)msg->getMsg(),msg->getSize());
+                        return CL_ASSIGN_AND_DONE;
-                }
-                break;
@@ -197 +198 @@
-        {
-        g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
-                return CL_ASSIGN_AND_DONE;
-        }
-        return CL_DROP;