diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-02-20 22:55:24 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-02-20 22:55:24 +0000 |
| commit | 1468a7f080de048e7c301af58d890d530c5ee685 (patch) | |
| tree | 7d4f89aa12fcfa2467f04bc9786ab980fb35b5e0 /protocols/Tlen/src/tlen_p2p_new.cpp | |
| parent | b166399eeadfb34652a0171c966161d2fe9cd38c (diff) | |
Tlen: memory leaks fixed.
git-svn-id: http://svn.miranda-ng.org/main/trunk@12225 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tlen/src/tlen_p2p_new.cpp')
| -rw-r--r-- | protocols/Tlen/src/tlen_p2p_new.cpp | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/protocols/Tlen/src/tlen_p2p_new.cpp b/protocols/Tlen/src/tlen_p2p_new.cpp index 1591e93c99..ec7ebdd473 100644 --- a/protocols/Tlen/src/tlen_p2p_new.cpp +++ b/protocols/Tlen/src/tlen_p2p_new.cpp @@ -27,15 +27,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static void logInfo(const char *filename, const char *fmt, ...) {
- SYSTEMTIME time;
- char *str;
va_list vararg;
- int strsize;
FILE *flog=fopen(filename,"at");
if (flog != NULL) {
+ SYSTEMTIME time;
GetLocalTime(&time);
va_start(vararg, fmt);
- str = (char *) mir_alloc(strsize=2048);
+ int strsize=2048;
+ char *str = (char *) mir_alloc(strsize);
while (mir_vsnprintf(str, strsize, fmt, vararg) == -1)
str = (char *) realloc(str, strsize+=2048);
va_end(vararg);
@@ -131,9 +130,6 @@ void __cdecl TlenNewFileSendThread(TLEN_FILE_TRANSFER *ft) if (fout != NULL) {
fprintf(fout, "START:");
}
- if (fout != NULL) {
- fclose(fout);
- }
for (step = 0; step < 10; step ++) {
// while (ft->udps != INVALID_SOCKET) {
int alen;
@@ -160,10 +156,12 @@ void __cdecl TlenNewFileSendThread(TLEN_FILE_TRANSFER *ft) }
if (fout != NULL) {
fprintf(fout, "\n");
- fclose(fout);
}
SleepEx(1000, TRUE);
}
+ if (fout != NULL) {
+ fclose(fout);
+ }
}
ft->proto->debugLogA("P2P send thread ended");
}
@@ -246,11 +244,10 @@ void __cdecl TlenProcessP2P(XmlNode *node, ThreadData *info) { id = TlenXmlGetAttrValue(fs, "i");
if (e != NULL) {
if (!strcmp(e, "1")) {
- char *c, *s;
TLEN_FILE_TRANSFER * ft = (TLEN_FILE_TRANSFER *) mir_alloc(sizeof(TLEN_FILE_TRANSFER));
memset(ft, 0, sizeof(TLEN_FILE_TRANSFER));
- c = TlenXmlGetAttrValue(fs, "c");
- s = TlenXmlGetAttrValue(fs, "s");
+ char *c = TlenXmlGetAttrValue(fs, "c");
+ char *s = TlenXmlGetAttrValue(fs, "s");
ft->jid = mir_strdup(from);
ft->proto = info->proto;
ft->hContact = TlenHContactFromJID(info->proto, from);
@@ -289,28 +286,21 @@ void __cdecl TlenProcessP2P(XmlNode *node, ThreadData *info) { } else if (vs != NULL) {
} else if (dcng != NULL) {
- char *s, *id, *id2;
info->proto->debugLogA("DCNG");
- s = TlenXmlGetAttrValue(dcng, "s");
- id2 = TlenXmlGetAttrValue(dcng, "i");
- id = TlenXmlGetAttrValue(dcng, "mi");
+ char *s = TlenXmlGetAttrValue(dcng, "s");
+ char *id2 = TlenXmlGetAttrValue(dcng, "i");
+ char *id = TlenXmlGetAttrValue(dcng, "mi");
if (!strcmp(s, "1")) {
/* Keys */
- /* n - name (file_send) */
- /* k - ??? */
- /* v - ??? */
/* s - step */
/* i - id of the file */
- /* ck - aes key */
/* ks - key size (in bytes) */
- /* iv - aes initial vector */
/* mi - p2p connection id */
- char *n, *k, *v, *ck, *iv;
- n = TlenXmlGetAttrValue(dcng, "n");
- k = TlenXmlGetAttrValue(dcng, "k");
- v = TlenXmlGetAttrValue(dcng, "v");
- ck = TlenXmlGetAttrValue(dcng, "ck");
- iv = TlenXmlGetAttrValue(dcng, "iv");
+ char *n = TlenXmlGetAttrValue(dcng, "n"); // n - name (file_send)
+ char *k = TlenXmlGetAttrValue(dcng, "k"); // k - ???
+ char *v = TlenXmlGetAttrValue(dcng, "v"); // v - ???
+ char *ck = TlenXmlGetAttrValue(dcng, "ck"); // ck - aes key
+ char *iv = TlenXmlGetAttrValue(dcng, "iv"); // iv - aes initial vector
if (!strcmp(n, "file_send")) {
if ((item=TlenListGetItemPtr(info->proto, LIST_FILE, id)) != NULL) {
item->id2 = mir_strdup(id2);
|