SOURCES: centericq-icq-short-read.patch (NEW), centericq-memory-ha...

glen glen at pld-linux.org
Tue Dec 20 21:56:44 CET 2005


Author: glen                         Date: Tue Dec 20 20:56:44 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- added

---- Files affected:
SOURCES:
   centericq-icq-short-read.patch (NONE -> 1.1)  (NEW), centericq-memory-handling.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/centericq-icq-short-read.patch
diff -u /dev/null SOURCES/centericq-icq-short-read.patch:1.1
--- /dev/null	Tue Dec 20 21:56:44 2005
+++ SOURCES/centericq-icq-short-read.patch	Tue Dec 20 21:56:39 2005
@@ -0,0 +1,10 @@
+--- centericq-4.21.0.orig/libicq2000-0.1/src/DirectClient.cpp
++++ centericq-4.21.0/libicq2000-0.1/src/DirectClient.cpp
+@@ -162,6 +162,7 @@
+ 
+       m_recv.setLittleEndian();
+       m_recv >> length;
++      if (length == 0) return; // short read, toss it back (nothing to do)
+       if (length > Incoming_Packet_Limit) throw ParseException("Received too long incoming packet");
+       if (m_recv.remains() < length) return; // waiting for more of the packet
+ 

================================================================
Index: SOURCES/centericq-memory-handling.patch
diff -u /dev/null SOURCES/centericq-memory-handling.patch:1.1
--- /dev/null	Tue Dec 20 21:56:44 2005
+++ SOURCES/centericq-memory-handling.patch	Tue Dec 20 21:56:39 2005
@@ -0,0 +1,26 @@
+--- centericq-4.21.0.orig/src/icqface.cc
++++ centericq-4.21.0/src/icqface.cc
+@@ -2003,7 +2003,7 @@
+ 	    mvaddchnstr(i-1, sizeWArea.x1+1, logline, sizeWArea.x2-sizeWArea.x1);
+ 	}
+ 
+-	delete logline;
++	delete[] logline;
+ 
+ 	if(text.size() > sizeWArea.x2-sizeWArea.x1-2) text.resize(sizeWArea.x2-sizeWArea.x1-2);
+ 	mvhline(LINES-3, sizeWArea.x1+2, ' ', sizeWArea.x2-sizeWArea.x1-2);
+only in patch2:
+unchanged:
+--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.cc
++++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc
+@@ -907,8 +907,8 @@
+ 	    r += soutbuf;
+ 	    text.erase(0, text.size()-inleft);
+ 
+-	    delete soutbuf;
+-	    delete sinbuf;
++	    delete[] soutbuf;
++	    free(sinbuf);
+ 
+ 	    if(res == -1 && errno != EILSEQ)
+ 		break;
================================================================


More information about the pld-cvs-commit mailing list