1
0
mirror of https://github.com/postgres/postgres.git synced 2025-08-05 07:41:25 +03:00

Fix memory allocation for output of hstore type.

Per "maosen.zhang" <maosen.zhang@alibaba-inc.com> report.
This commit is contained in:
Teodor Sigaev
2009-04-02 17:57:59 +00:00
parent e7a4b97917
commit a1e9a25dc3

View File

@@ -440,7 +440,8 @@ hstore_out(PG_FUNCTION_ARGS)
{ {
HStore *in = PG_GETARG_HS(0); HStore *in = PG_GETARG_HS(0);
int buflen, int buflen,
i; i,
nnulls=0;
char *out, char *out,
*ptr; *ptr;
char *base = STRPTR(in); char *base = STRPTR(in);
@@ -454,8 +455,15 @@ hstore_out(PG_FUNCTION_ARGS)
PG_RETURN_CSTRING(out); PG_RETURN_CSTRING(out);
} }
buflen = (4 /* " */ + 2 /* => */ + 2 /* , */ ) * in->size + for (i = 0; i < in->size; i++)
2 /* esc */ * (VARSIZE(in) - CALCDATASIZE(in->size, 0)); if (entries[i].valisnull)
nnulls++;
buflen = (4 /* " */ + 2 /* => */ ) * ( in->size - nnulls ) +
( 2 /* " */ + 2 /* => */ + 4 /* NULL */ ) * nnulls +
2 /* , */ * ( in->size - 1 ) +
2 /* esc */ * (VARSIZE(in) - CALCDATASIZE(in->size, 0)) +
1 /* \0 */;
out = ptr = palloc(buflen); out = ptr = palloc(buflen);
for (i = 0; i < in->size; i++) for (i = 0; i < in->size; i++)