git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c

index 441dbf4a7c246dcc1d70fe6e5f30e104d2906ad8..6ce3047215ddff917d6ff0d5c61e50c89b74d441 100644 (file)

--- a/contrib/hstore/hstore_io.c

+++ b/contrib/hstore/hstore_io.c

key.type = jbvString;

key.val.string.len = HS_KEYLEN(entries, i);

- key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);

+ key.val.string.val = HS_KEY(entries, base, i);

res = pushJsonbValue(&state, WJB_KEY, &key);

{

val.type = jbvString;

val.val.string.len = HS_VALLEN(entries, i);

- val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);

+ val.val.string.val = HS_VAL(entries, base, i);

}

res = pushJsonbValue(&state, WJB_VALUE, &val);

}

key.type = jbvString;

key.val.string.len = HS_KEYLEN(entries, i);

- key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);

+ key.val.string.val = HS_KEY(entries, base, i);

res = pushJsonbValue(&state, WJB_KEY, &key);

{

val.type = jbvString;

val.val.string.len = HS_VALLEN(entries, i);

- val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);

+ val.val.string.val = HS_VAL(entries, base, i);

}

}

res = pushJsonbValue(&state, WJB_VALUE, &val);

diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c

index 16f4eccc06ec2228a60d6c5440caacca2cc87362..e2db24520eb0f2c835ab512a53cccec7a82c65a2 100644 (file)

--- a/src/backend/utils/adt/json.c

+++ b/src/backend/utils/adt/json.c

if (oend != NULL)

(*oend) (sem->semstate, fname, isnull);

-

- if (fname != NULL)

- pfree(fname);

}

static void

diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c

index e1fe45f712835b5b3cb65fcf115c7f463da0f5e0..2fd87fc9e1afa95eebafcbd085f8597b272376ca 100644 (file)

--- a/src/backend/utils/adt/jsonb.c

+++ b/src/backend/utils/adt/jsonb.c

Assert(fname != NULL);

v.type = jbvString;

v.val.string.len = checkStringLen(strlen(fname));

- v.val.string.val = pnstrdup(fname, v.val.string.len);

+ v.val.string.val = fname;

_state->res = pushJsonbValue(&_state->parseState, WJB_KEY, &v);

}

Assert(token != NULL);

v.type = jbvString;

v.val.string.len = checkStringLen(strlen(token));

- v.val.string.val = pnstrdup(token, v.val.string.len);

+ v.val.string.val = token;

break;

case JSON_TOKEN_NUMBER:

diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h

index 889364fb30e5f71c4d11afd562aa802034476f89..df057121a1178e3687580c8def057a65ada63cb6 100644 (file)

--- a/src/include/utils/jsonapi.h

+++ b/src/include/utils/jsonapi.h

* point, Likewise, semstate can be NULL. Using an all-NULL structure amounts

* to doing a pure parse with no side-effects, and is therefore exactly

* what the json input routines do.

+ *

+ * The 'fname' and 'token' strings passed to these actions are palloc'd.

+ * They are not free'd or used further by the parser, so the action function

+ * is free to do what it wishes with them.

*/

typedef struct JsonSemAction

{