[519] in BarnOwl Developers
[D-O-H] r639 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:02 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Thu, 1 Mar 2007 22:38:51 -0500 (EST)
Author: nelhage
Date: 2007-03-01 22:38:51 -0500 (Thu, 01 Mar 2007)
New Revision: 639
Modified:
trunk/
trunk/owl/message.c
trunk/owl/util.c
Log:
r19177@phanatique: nelhage | 2007-03-01 22:37:56 -0500
Fix a pair of stupid minor memory leaks.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19164
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19177
Modified: trunk/owl/message.c
===================================================================
--- trunk/owl/message.c 2007-03-01 06:52:22 UTC (rev 638)
+++ trunk/owl/message.c 2007-03-02 03:38:51 UTC (rev 639)
@@ -17,7 +17,7 @@
m->id=owl_global_get_nextmsgid(&g);
owl_message_set_direction_none(m);
m->delete=0;
- m->zwriteline=strdup("");
+ m->zwriteline=NULL;
m->invalid_format=1;
owl_message_set_hostname(m, "");
@@ -453,11 +453,14 @@
char *owl_message_get_zwriteline(owl_message *m)
{
+ if(!m->zwriteline)
+ return "";
return(m->zwriteline);
}
void owl_message_set_zwriteline(owl_message *m, char *line)
{
+ if(m->zwriteline) owl_free(m->zwriteline);
m->zwriteline=strdup(line);
}
Modified: trunk/owl/util.c
===================================================================
--- trunk/owl/util.c 2007-03-01 06:52:22 UTC (rev 638)
+++ trunk/owl/util.c 2007-03-02 03:38:51 UTC (rev 639)
@@ -345,6 +345,8 @@
curarg[strlen(curarg)]=line[i];
}
+ free(curarg);
+
/* check for unbalanced quotes */
if (quote!='\0') {
owl_parsefree(argv, *argc);
