- flush
[m6w6/ext-http] / http_api.c
index 1773ce7bc1f702ae7edffc4bf3415cad849b3abf..3dcaff04253ee05591209d12c72c2d04a3ac54e7 100644 (file)
@@ -91,8 +91,8 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                if (decode) { \
                        decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
                } else { \
                if (decode) { \
                        decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
                } else { \
-                       decoded = estrdup(str); \
                        decoded_len = len; \
                        decoded_len = len; \
+                       decoded = estrndup(str, decoded_len); \
                } \
                add_assoc_stringl(array, k, decoded, decoded_len, 0); \
        }
                } \
                add_assoc_stringl(array, k, decoded, decoded_len, 0); \
        }
@@ -120,7 +120,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                        key = val + strlen(val);
                        HTTP_KEYLIST_FIXVAL();
                        HTTP_KEYLIST_VAL(&array, "value", val, vallen);
                        key = val + strlen(val);
                        HTTP_KEYLIST_FIXVAL();
                        HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-                       goto list_done;
+                       return SUCCESS;
                }
                /* additional info appended */
                else {
                }
                /* additional info appended */
                else {
@@ -152,7 +152,6 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                efree(keydup);
        } while (!done);
 
                efree(keydup);
        } while (!done);
 
-list_done:
        return SUCCESS;
 }
 
        return SUCCESS;
 }