- Respect CXXFLAGS

- Fix some annoying memory leekage bugs that tends to core dumps. PR: ports/101688 Submitted by: Stanislav Sedov <ssedov_AT_mbsd dot msk dot ru>
truenas · Aug 10, 2006 · e9479c3 · e9479c3
1 parent 409a549
commit e9479c3
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 2 deletions.
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	centericq
 PORTVERSION=	4.21.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://centericq.de/archive/source/releases/ \
 		http://thekonst.net/download/
@@ -22,7 +22,7 @@ USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="-I${LOCALBASE}/include"
+		CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
 LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++
 CONFIGURE_ARGS=	--with-openssl --disable-konst
 

diff --git a/net-im/centericq/files/patch-kkconsui-0.1_src_texteditor.cc b/net-im/centericq/files/patch-kkconsui-0.1_src_texteditor.cc
@@ -0,0 +1,67 @@
+--- 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];
diff --git a/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc b/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc
@@ -0,0 +1,40 @@
+--- 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;
diff --git a/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.h b/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.h
@@ -0,0 +1,11 @@
+--- kkstrtext-0.1/kkstrtext.h.orig	Wed Aug  9 10:50:49 2006
++++ kkstrtext-0.1/kkstrtext.h	Wed Aug  9 10:51:12 2006
+@@ -87,7 +87,7 @@
+     { \
+ 	va_list vgs__ap; char vgs__buf[1024]; \
+ 	va_start(vgs__ap, fmt); \
+-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
++	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
+ 	va_end(vgs__ap); \
+     }
+
diff --git a/net-im/centericq/files/patch-libicq2000-0.1_src_DirectClient.cpp b/net-im/centericq/files/patch-libicq2000-0.1_src_DirectClient.cpp
@@ -0,0 +1,11 @@
+--- libicq2000-0.1/src/DirectClient.cpp.orig	Wed Aug  9 10:52:04 2006
++++ libicq2000-0.1/src/DirectClient.cpp	Wed Aug  9 10:53:26 2006
+@@ -162,6 +162,8 @@
+
+       m_recv.setLittleEndian();
+       m_recv >> length;
++      if (length == 0)
++		return;
+       if (length > Incoming_Packet_Limit) throw ParseException("Received too long incoming packet");
+       if (m_recv.remains() < length) return; // waiting for more of the packet
+
diff --git a/net-im/centericq/files/patch-src_icqface.cc b/net-im/centericq/files/patch-src_icqface.cc
@@ -0,0 +1,11 @@
+--- src/icqface.cc.orig	Wed Aug  9 10:43:40 2006
++++ src/icqface.cc	Wed Aug  9 10:44:14 2006
+@@ -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);