On 2016-06-21 17:19, Matthias Schiffer wrote:
> The current blobmsg_format_json* functions will return invalid JSON when
> the "list" argument is given as false (blobmsg_format_element() will
> output the name of the blob_attr as if the value is printed as part of a
> JSON object).
>
> To avoid breaking software relying on this behaviour, introduce new
> functions which will never print the blob_attr name and thus always
> produce valid JSON.
>
> Signed-off-by: Matthias Schiffer <mschif...@universe-factory.net>
> ---
> v2: no changes
>
> blobmsg_json.c | 61
> ++++++++++++++++++++++++++++++++++++++++++++--------------
> blobmsg_json.h | 14 ++++++++++++++
> 2 files changed, 61 insertions(+), 14 deletions(-)
>
> diff --git a/blobmsg_json.c b/blobmsg_json.c
> index 2e318b2..78747d1 100644
> --- a/blobmsg_json.c
> +++ b/blobmsg_json.c
> @@ -293,27 +293,30 @@ static void blobmsg_format_json_list(struct strbuf *s,
> struct blob_attr *attr, i
> blobmsg_puts(s, (array ? "]" : "}"), 1);
> }
>
> +static void setup_strbuf(struct strbuf *s, struct blob_attr *attr,
> blobmsg_json_format_t cb, void *priv, int indent) {
The '{' should go on the next line.
> @@ -337,3 +340,33 @@ char *blobmsg_format_json_with_cb(struct blob_attr
> *attr, bool list, blobmsg_jso
>
> return ret;
> }
> +
> +char *blobmsg_format_json_value_with_cb(struct blob_attr *attr,
> blobmsg_json_format_t cb, void *priv, int indent)
> +{
> + struct strbuf s;
> + char *ret;
> +
> + setup_strbuf(&s, attr, cb, priv, indent);
> + if (!s.buf)
> + return NULL;
> +
> + blobmsg_format_element(&s, attr, true, false);
> +
> + if (!s.len) {
> + free(s.buf);
> + return NULL;
> + }
> +
> + s.buf = realloc(s.buf, s.pos + 1);
> + s.buf[s.pos] = 0;
> +
> + ret = realloc(s.buf, s.pos + 1);
The double realloc looks bogus to me.
- Felix
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
