Replace free() with mh_free0()

[mmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 8915798..b2e1176 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -104,7 +104,7 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
                dftype = LOCALHOST;
        }
 
-       mp = (struct mailname *) mh_xcalloc((size_t) 1, sizeof(*mp));
+       mp = mh_xcalloc(1, sizeof(*mp));
        if (mp == NULL) {
                if (eresult)
                        strcpy(eresult, "insufficient memory to represent address");
@@ -170,21 +170,21 @@ mnfree(struct mailname *mp)
                return;
 
        if (mp->m_text)
-               free(mp->m_text);
+               mh_free0(&(mp->m_text));
        if (mp->m_pers)
-               free(mp->m_pers);
+               mh_free0(&(mp->m_pers));
        if (mp->m_mbox)
-               free(mp->m_mbox);
+               mh_free0(&(mp->m_mbox));
        if (mp->m_host)
-               free(mp->m_host);
+               mh_free0(&(mp->m_host));
        if (mp->m_path)
-               free(mp->m_path);
+               mh_free0(&(mp->m_path));
        if (mp->m_gname)
-               free(mp->m_gname);
+               mh_free0(&(mp->m_gname));
        if (mp->m_note)
-               free(mp->m_note);
+               mh_free0(&(mp->m_note));
 
-       free((char *) mp);
+       mh_free0(&mp);
 }
 
 
@@ -252,10 +252,10 @@ ismymbox(struct mailname *np)
        if (am == NULL) {
                mq.m_next = NULL;
                mq.m_mbox = getusername();
+               mp = &mq;
                if ((am = context_find("alternate-mailboxes")) == NULL) {
                        am = getusername();
                } else {
-                       mp = &mq;
                        oops = 0;
                        while ((cp = getname(am))) {
                                if ((mp->m_next = getm(cp, NULL, 0, AD_NAME, NULL)) == NULL) {
@@ -410,17 +410,21 @@ local_test: ;
  * number of parsed addresses. element is set to
  * the last parsed addresse.
  */
-size_t
+ssize_t
 getmboxes(char *line, struct mailname **element)
 {
-       struct mailname *mp, *next;
+       struct mailname *mp, *next, *first;
        char *cp;
        size_t i = 0;
 
-       next = (*element)->m_next;
+       first = *element;
+       next = first->m_next;
 
        while ((cp = getname(line))) {
                mp = getm(cp, NULL, 0, AD_HOST, NULL);
+               if (mp == NULL) {
+                       goto error;
+               }
                (*element)->m_next = mp;
                *element = mp;
                i++;
@@ -428,4 +432,12 @@ getmboxes(char *line, struct mailname **element)
 
        (*element)->m_next = next;
        return i;
+error:
+       while (first->m_next != NULL && first->m_next != next) {
+               mp = first->m_next;
+               first->m_next = mp->m_next;
+               mh_free0(&mp);
+       }
+       first->m_next = next;
+       return -1;
 }