philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a memory leak in the URL grabber - as old URLs were expired from the list,

Browse Source 
they weren't being freed.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@131 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-05-17 14:03:29 +00:00
parent 41d0516849
commit b628217600
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2c01] [Changes 1.2c01]
* Tidy up the URL grabber, fixing a memory leak. (caf)
* Cleanup the /BHELP code, fixing a potential crash. Apply updates to * Cleanup the /BHELP code, fixing a potential crash. Apply updates to
BitchX.help from t3gah. (caf) BitchX.help from t3gah. (caf)

35
source/commands2.c
View File

@@ -1503,20 +1503,23 @@ UrlList *url_list = NULL,
*prev_url = NULL, *prev_url = NULL,
*new_url = NULL; *new_url = NULL;
static int url_count = 0;
int grab_http(char *from, char *to, char *text) int grab_http(char *from, char *to, char *text)
{ {
#ifdef PUBLIC_ACCESS #ifdef PUBLIC_ACCESS
return 0; return 0;
#else #else
static int count = 0; static int count = 0;
int url_count = 0;
char *q = NULL; char *q = NULL;
if ((get_int_var(HTTP_GRAB_VAR) && stristr(text, "HTTP:")) || (get_int_var(FTP_GRAB_VAR) && (stristr(text, "FTP:") || stristr(text, "FTP.")))) if ((get_int_var(HTTP_GRAB_VAR) && stristr(text, "HTTP:")) || (get_int_var(FTP_GRAB_VAR) && (stristr(text, "FTP:") || stristr(text, "FTP."))))
{ {
malloc_sprintf(&q, "%s %s -- %s", from, to, text); malloc_sprintf(&q, "%s %s -- %s", from, to, text);
/* Look for end of the list, counting as we go */
for (cur_url = url_list, prev_url = NULL; cur_url; prev_url = cur_url, cur_url = cur_url->next) for (cur_url = url_list, prev_url = NULL; cur_url; prev_url = cur_url, cur_url = cur_url->next)
{ {
url_count++;
/* If we find that the URL is already in the list, bail out. */
if (cur_url->name && !my_stricmp(cur_url->name, q)) if (cur_url->name && !my_stricmp(cur_url->name, q))
{ {
new_free(&q); new_free(&q);
@@ -1524,23 +1527,26 @@ char *q = NULL;
} }
} }
while (url_count >= get_int_var(MAX_URLS_VAR)) /* Add the new URL at the end of the list */
{
if (!prev_url)
url_list = NULL;
else
url_list = url_list->next;
url_count--;
}
url_count++;
count++;
new_url = (UrlList *) new_malloc(sizeof(UrlList)); new_url = (UrlList *) new_malloc(sizeof(UrlList));
new_url->name = q; new_url->name = q;
new_url->next = cur_url; new_url->next = NULL;
if (!prev_url) if (!prev_url)
url_list = new_url; url_list = new_url;
else else
prev_url->next = new_url; prev_url->next = new_url;
url_count++;
count++;
/* Prune off any excess entries */
while (url_count > get_int_var(MAX_URLS_VAR) && url_list)
{
UrlList *tmp = url_list;
url_list = url_list->next;
new_free(&tmp->name);
new_free(&tmp);
url_count--;
}
if (do_hook(URLGRAB_LIST, "%d %d %s %s %s %s", url_count, count, from, FromUserHost, to, text)) if (do_hook(URLGRAB_LIST, "%d %d %s %s %s %s", url_count, count, from, FromUserHost, to, text))
bitchsay("Added HTTP/FTP grab [%d/%d]", url_count, count); bitchsay("Added HTTP/FTP grab [%d/%d]", url_count, count);
@@ -1583,7 +1589,6 @@ int do_display = 1;
} }
new_free(&filename); new_free(&filename);
fclose(file); fclose(file);
url_count = 0;
prev_url = url_list; prev_url = url_list;
while (prev_url) while (prev_url)
{ {
@@ -1619,7 +1624,6 @@ int do_display = 1;
{ {
if (!*++p) if (!*++p)
{ {
url_count = 0;
prev_url = url_list; prev_url = url_list;
while (prev_url) while (prev_url)
{ {
@@ -1642,7 +1646,6 @@ int do_display = 1;
prev_url->next = cur_url->next; prev_url->next = cur_url->next;
new_free(&cur_url); new_free(&cur_url);
bitchsay("Cleared Url [%d]", q); bitchsay("Cleared Url [%d]", q);
url_count--;
} }
else else
bitchsay("Url [%d] not found", q); bitchsay("Url [%d] not found", q);