c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix memory allocation for output of hstore type.

Browse source 
Per "maosen.zhang" <maosen.zhang@alibaba-inc.com> report.
This commit is contained in:
Teodor Sigaev 2009-04-02 17:57:05 +00:00
parent 96e218a049
commit 3df4fa6968
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
contrib/hstore/hstore_io.c
View file

@ -1,5 +1,5 @@
/*
* $PostgreSQL: pgsql/contrib/hstore/hstore_io.c,v 1.9 2009/03/15 22:05:17 tgl Exp $
* $PostgreSQL: pgsql/contrib/hstore/hstore_io.c,v 1.10 2009/04/02 17:57:05 teodor Exp $
*/
#include "postgres.h"
@ -446,7 +446,8 @@ hstore_out(PG_FUNCTION_ARGS)
{
HStore *in = PG_GETARG_HS(0);
int buflen,
i;
i,
nnulls=0;
char *out,
*ptr;
char *base = STRPTR(in);
@ -460,8 +461,15 @@ hstore_out(PG_FUNCTION_ARGS)
PG_RETURN_CSTRING(out);
}
buflen = (4 /* " */ + 2 /* => */ + 2 /* , */ ) * in->size +
2 /* esc */ * (VARSIZE(in) - CALCDATASIZE(in->size, 0));
for (i = 0; i < in->size; i++)
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);
for (i = 0; i < in->size; i++)