Attachment #69500 for bug #101688

View | Details | Raw Unified | Return to bug 101688
Collapse All | Expand All

Lines 8-14 Link Here

(-)/var/tmp/centericq/Makefile (-2 / +2 lines)
8		8
9	PORTNAME= centericq	9	PORTNAME= centericq
10	PORTVERSION= 4.21.0	10	PORTVERSION= 4.21.0
11	PORTREVISION= 3	11	PORTREVISION= 4
12	CATEGORIES= net-im	12	CATEGORIES= net-im
13	MASTER_SITES= http://centericq.de/archive/source/releases/ \	13	MASTER_SITES= http://centericq.de/archive/source/releases/ \
14	http://thekonst.net/download/	14	http://thekonst.net/download/
Lines 22-28 Link Here
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \	24	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
25	CXXFLAGS="-I${LOCALBASE}/include"	25	CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
26	LDFLAGS+= -L${LOCALBASE}/lib -lstdc++	26	LDFLAGS+= -L${LOCALBASE}/lib -lstdc++
27	CONFIGURE_ARGS= --with-openssl --disable-konst	27	CONFIGURE_ARGS= --with-openssl --disable-konst
28		28




--- kkconsui-0.1/src/texteditor.cc.orig	Wed Aug  9 12:23:58 2006
+++ kkconsui-0.1/src/texteditor.cc	Wed Aug  9 12:24:17 2006
@@ -106,7 +106,7 @@
 	fread(p, st.st_size, 1, f);
 	p[st.st_size] = 0;
 	i = load(p, strdup(id.c_str()));
-	delete p;
+	delete[] p;
     }
 
     return i;
@@ -124,7 +124,7 @@
     f.read(buf, size);
     buf[size] = 0;
     ret = load(buf, strdup(id.c_str()));
-    delete buf;
+    delete[] buf;
 
     return ret;
 }
@@ -172,7 +172,7 @@
 int texteditor::save(FILE *f, const char *linebreak) {
     char *buf = save(linebreak);
     fwrite(buf, strlen(buf), 1, f);
-    delete buf;
+    free(buf);
     modified = false;
     return 0;
 }
@@ -180,7 +180,7 @@
 int texteditor::save(ofstream &f, const string linebreak) {
     char *buf = save(linebreak.c_str());
     f.write(buf, strlen(buf));
-    delete buf;
+    free(buf);
     f.close();
     modified = false;
     return 0;
@@ -526,7 +526,7 @@
 	fread(buf, fsize, 1, f);
 	buf[fsize] = 0;
 	insert(buf);
-	delete buf;
+	delete[] buf;
     }
 }
 
@@ -576,8 +576,8 @@
 	    firstpass = false;
 	}
     
-	delete el;
-	delete sl;
+	free(el);
+	free(sl);
 
 	modification(uinsblock, sbuf);
     }
@@ -1081,7 +1081,7 @@
 			curfile->lines->replace(CURLINE, newline);
 		    }
 
-		    delete anext;
+		    free(anext);
 		} else {
 		    if(next) nextlen = strlen(next); else nextlen = 0;
 		    char *newline = new char[nextlen+strlen(p)+1];




--- kkstrtext-0.1/kkstrtext.cc.orig	Wed Aug  9 10:44:43 2006
+++ kkstrtext-0.1/kkstrtext.cc	Wed Aug  9 10:50:27 2006
@@ -154,7 +154,7 @@
     string r;
     char *buf = (char *) utf8_to_str(text.c_str());
     r = buf;
-    delete buf;
+    delete[] buf;
     return r;
 }
 
@@ -162,7 +162,7 @@
     string r;
     char *buf = str_to_utf8(text.c_str());
     r = buf;
-    delete buf;
+    delete[] buf;
     return r;
 }
 
@@ -416,7 +416,7 @@
 
 void charpointerfree(void *p) {
     char *cp = (char *) p;
-    if(cp) delete cp;
+    if(cp) free(cp);
 }
 
 void nothingfree(void *p) {
@@ -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;

Line 0 Link Here

(-)/var/tmp/centericq/files/patch-kkstrtext-0.1_kkstrtext.h (+11 lines)
	1	--- kkstrtext-0.1/kkstrtext.h.orig Wed Aug 9 10:50:49 2006
	2	+++ kkstrtext-0.1/kkstrtext.h Wed Aug 9 10:51:12 2006
	3	@@ -87,7 +87,7 @@
	4	{ \
	5	va_list vgs__ap; char vgs__buf[1024]; \
	6	va_start(vgs__ap, fmt); \
	7	- vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
	8	+ vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
	9	va_end(vgs__ap); \
	10	}
	11

Line 0 Link Here

(-)/var/tmp/centericq/files/patch-libicq2000-0.1_src_DirectClient.cpp (+11 lines)
	1	--- libicq2000-0.1/src/DirectClient.cpp.orig Wed Aug 9 10:52:04 2006
	2	+++ libicq2000-0.1/src/DirectClient.cpp Wed Aug 9 10:53:26 2006
	3	@@ -162,6 +162,8 @@
	4
	5	m_recv.setLittleEndian();
	6	m_recv >> length;
	7	+ if (length == 0)
	8	+ return;
	9	if (length > Incoming_Packet_Limit) throw ParseException("Received too long incoming packet");
	10	if (m_recv.remains() < length) return; // waiting for more of the packet
	11

Line 0 Link Here

(-)/var/tmp/centericq/files/patch-src_icqface.cc (+11 lines)
	1	--- src/icqface.cc.orig Wed Aug 9 10:43:40 2006
	2	+++ src/icqface.cc Wed Aug 9 10:44:14 2006
	3	@@ -2003,7 +2003,7 @@
	4	mvaddchnstr(i-1, sizeWArea.x1+1, logline, sizeWArea.x2-sizeWArea.x1);
	5	}
	6
	7	- delete logline;
	8	+ delete[] logline;
	9
	10	if(text.size() > sizeWArea.x2-sizeWArea.x1-2) text.resize(sizeWArea.x2-sizeWArea.x1-2);
	11	mvhline(LINES-3, sizeWArea.x1+2, ' ', sizeWArea.x2-sizeWArea.x1-2);

Return to bug 101688

Line 0 Link Here

(-)/var/tmp/centericq/files/patch-kkconsui-0.1_src_texteditor.cc (+67 lines)
		1	--- kkconsui-0.1/src/texteditor.cc.orig Wed Aug 9 12:23:58 2006
		2	+++ kkconsui-0.1/src/texteditor.cc Wed Aug 9 12:24:17 2006
		3	@@ -106,7 +106,7 @@
		4	fread(p, st.st_size, 1, f);
		5	p[st.st_size] = 0;
		6	i = load(p, strdup(id.c_str()));
		7	- delete p;
		8	+ delete[] p;
		9	}
		10
		11	return i;
		12	@@ -124,7 +124,7 @@
		13	f.read(buf, size);
		14	buf[size] = 0;
		15	ret = load(buf, strdup(id.c_str()));
		16	- delete buf;
		17	+ delete[] buf;
		18
		19	return ret;
		20	}
		21	@@ -172,7 +172,7 @@
		22	int texteditor::save(FILE f, const char linebreak) {
		23	char *buf = save(linebreak);
		24	fwrite(buf, strlen(buf), 1, f);
		25	- delete buf;
		26	+ free(buf);
		27	modified = false;
		28	return 0;
		29	}
		30	@@ -180,7 +180,7 @@
		31	int texteditor::save(ofstream &f, const string linebreak) {
		32	char *buf = save(linebreak.c_str());
		33	f.write(buf, strlen(buf));
		34	- delete buf;
		35	+ free(buf);
		36	f.close();
		37	modified = false;
		38	return 0;
		39	@@ -526,7 +526,7 @@
		40	fread(buf, fsize, 1, f);
		41	buf[fsize] = 0;
		42	insert(buf);
		43	- delete buf;
		44	+ delete[] buf;
		45	}
		46	}
		47
		48	@@ -576,8 +576,8 @@
		49	firstpass = false;
		50	}
		51
		52	- delete el;
		53	- delete sl;
		54	+ free(el);
		55	+ free(sl);
		56
		57	modification(uinsblock, sbuf);
		58	}
		59	@@ -1081,7 +1081,7 @@
		60	curfile->lines->replace(CURLINE, newline);
		61	}
		62
		63	- delete anext;
		64	+ free(anext);
65	} else {
66	if(next) nextlen = strlen(next); else nextlen = 0;
67	char *newline = new char[nextlen+strlen(p)+1];

Line 0 Link Here

(-)/var/tmp/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc (+40 lines)
	1	--- kkstrtext-0.1/kkstrtext.cc.orig Wed Aug 9 10:44:43 2006
	2	+++ kkstrtext-0.1/kkstrtext.cc Wed Aug 9 10:50:27 2006
	3	@@ -154,7 +154,7 @@
	4	string r;
	5	char buf = (char ) utf8_to_str(text.c_str());
	6	r = buf;
	7	- delete buf;
	8	+ delete[] buf;
	9	return r;
	10	}
	11
	12	@@ -162,7 +162,7 @@
	13	string r;
	14	char *buf = str_to_utf8(text.c_str());
	15	r = buf;
	16	- delete buf;
	17	+ delete[] buf;
	18	return r;
	19	}
	20
	21	@@ -416,7 +416,7 @@
	22
	23	void charpointerfree(void *p) {
	24	char cp = (char ) p;
	25	- if(cp) delete cp;
	26	+ if(cp) free(cp);
	27	}
	28
	29	void nothingfree(void *p) {
	30	@@ -907,8 +907,8 @@
	31	r += soutbuf;
	32	text.erase(0, text.size()-inleft);
	33
	34	- delete soutbuf;
	35	- delete sinbuf;
	36	+ delete[] soutbuf;
	37	+ free(sinbuf);
	38
	39	if(res == -1 && errno != EILSEQ)
	40	break;