revert commit from PR 585

diff --git a/src/switch_xml.c b/src/switch_xml.c
index 50118720e0f0eb078133cd518f5f422f279a2c3e..13ef953b6be4858bff58e7aabf1c9aac648d6b87 100644 (file)
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -2955,91 +2955,58 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_set_txt(switch_xml_t xml, const char *tx
    of NULL will remove the specified attribute.  Returns the tag given */
 SWITCH_DECLARE(switch_xml_t) switch_xml_set_attr(switch_xml_t xml, const char *name, const char *value)
 {
-       int l = 0, attr_number, c;
-       /* After adding the first attribute, xml->attr = { name1, val1, name2, val2,
-        * ..., nameN, valN, NULL, alloc_flags }. alloc_flags tracks how the memory
-        * for each attr and value is managed. */
-       char *alloc_flags;
+       int l = 0, c;
 
        if (!xml)
                return NULL;
        while (xml->attr[l] && strcmp(xml->attr[l], name))
                l += 2;
-       attr_number = l / 2;
-
        if (!xml->attr[l]) {            /* not found, add as new attribute */
                if (!value)
-                       goto cleanup;           /* not found, no need to remove attribute */
+                       return xml;                     /* nothing to do */
                if (xml->attr == SWITCH_XML_NIL) {      /* first attribute */
-                       char ** tmp = (char **) malloc(4 * sizeof(char *));
-                       if (!tmp)
-                               goto cleanup;
-                       xml->attr = tmp;
-                       assert(l == 0);                 /* name of SWITCH_XML_NIL is assumed to be empty */
-                       xml->attr[0] = NULL;    /* terminator */
-                       xml->attr[1] = NULL;    /* empty list of malloced names/vals */
+                       xml->attr = (char **) malloc(4 * sizeof(char *));
+                       if (!xml->attr)
+                               return NULL;
+                       xml->attr[1] = strdup("");      /* empty list of malloced names/vals */
                } else {
                        char **tmp = (char **) realloc(xml->attr, (l + 4) * sizeof(char *));
                        if (!tmp)
-                               goto cleanup;
+                               return xml;
                        xml->attr = tmp;
                }
-               /* Extend list of allocation flags for the new attribute */
-               alloc_flags = (char *)realloc(xml->attr[l + 1], attr_number + 1);
-               if (!alloc_flags)
-                       goto cleanup;
-               alloc_flags[attr_number + 1] = '\0';    /* terminate list */
 
-               /* Add new attribute, the value will be set further below. */
                xml->attr[l] = (char *) name;   /* set attribute name */
-               name = NULL;                                    /* control of memory is transferred */
-               l += 2;
-
-               xml->attr[l] = NULL;                    /* null terminate attribute list */
-               xml->attr[l + 1] = alloc_flags;
+               xml->attr[l + 2] = NULL;        /* null terminate attribute list */
+               xml->attr[l + 3] = (char *) realloc(xml->attr[l + 1], (c = (int) strlen(xml->attr[l + 1])) + 2);
+               strcpy(xml->attr[l + 3] + c, " ");      /* set name/value as not malloced */
                if (xml->flags & SWITCH_XML_DUP)
-                       alloc_flags[attr_number] = SWITCH_XML_NAMEM;
-               else
-                       alloc_flags[attr_number] = ' ';         /* dummy value */
-       } else {
-               while (xml->attr[l]) l += 2;
-               alloc_flags = xml->attr[l + 1];
-       }
-
-       c = 2 * attr_number;            /* index of the current attribute name */
-       /* l points to the index of the terminator name */
+                       xml->attr[l + 3][c] = SWITCH_XML_NAMEM;
+       } else if (xml->flags & SWITCH_XML_DUP)
+               free((char *) name);    /* name was strduped */
 
-       if (alloc_flags[attr_number] & SWITCH_XML_TXTM)
-               free(xml->attr[c + 1]); /* old val */
+       for (c = l; xml->attr[c]; c += 2);      /* find end of attribute list */
+       if (xml->attr[c + 1][l / 2] & SWITCH_XML_TXTM)
+               free(xml->attr[l + 1]); /* old val */
        if (xml->flags & SWITCH_XML_DUP)
-               alloc_flags[attr_number] |= SWITCH_XML_TXTM;
+               xml->attr[c + 1][l / 2] |= SWITCH_XML_TXTM;
        else
-               alloc_flags[attr_number] &= ~SWITCH_XML_TXTM;
+               xml->attr[c + 1][l / 2] &= ~SWITCH_XML_TXTM;
 
-       if (value) {
-               xml->attr[c + 1] = (char *) value;      /* set attribute value */
-               value = NULL;                           /* control of memory is transferred */
-       } else {                                                /* remove attribute */
+       if (value)
+               xml->attr[l + 1] = (char *) value;      /* set attribute value */
+       else {                                          /* remove attribute */
                char **tmp;
-               /* free name if it was dynamically allocated (value is handled above) */
-               if (alloc_flags[attr_number] & SWITCH_XML_NAMEM)
-                       free(xml->attr[c]);
-
-               /* drop (name, value) pair from attribute list */
-               memmove(xml->attr + c, xml->attr + c + 2, (l - c) * sizeof(char *));
-               tmp = (char **) realloc(xml->attr, l * sizeof(char *));
-               if (tmp)                        /* try to shrink when possible */
-                       xml->attr = tmp;
-
-               memmove(alloc_flags + attr_number, alloc_flags + attr_number + 1, (l - c) / 2); /* shrink allocation info */
-       }
-
-cleanup:
-       if (xml->flags & SWITCH_XML_DUP) {
-               free((char *) name);    /* name was strduped */
-               free((char *) value);   /* name was strduped, but an error occurred */
-               xml->flags &= ~SWITCH_XML_DUP;  /* clear strdup() flag */
-       }
+               if (xml->attr[c + 1][l / 2] & SWITCH_XML_NAMEM)
+                       free(xml->attr[l]);
+               memmove(xml->attr + l, xml->attr + l + 2, (c - l + 2) * sizeof(char *));
+               tmp = (char **) realloc(xml->attr, (c + 2) * sizeof(char *));
+               if (!tmp)
+                       return xml;
+               xml->attr = tmp;
+               memmove(xml->attr[c + 1] + (l / 2), xml->attr[c + 1] + (l / 2) + 1, (c / 2) - (l / 2)); /* fix list of which name/vals are malloced */
+       }
+       xml->flags &= ~SWITCH_XML_DUP;  /* clear strdup() flag */
 
        return xml;
 }