diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-11-03 19:17:52 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-11-03 19:17:52 -0400 |
| commit | 92375ed2bdea82cd223244cf74dff532dc776405 (patch) | |
| tree | d298fffec3c14b979e3c8cd698a8ef41e4618555 | |
| parent | 1819a375f117b8f98f6d4dd33bf53169e5e001ba (diff) | |
| download | postgresql-92375ed2bdea82cd223244cf74dff532dc776405.tar.gz postgresql-92375ed2bdea82cd223244cf74dff532dc776405.zip | |
Fix bogus code in contrib/ tsearch dictionary examples.
Both dict_int and dict_xsyn were blithely assuming that whatever memory
palloc gives back will be pre-zeroed. This would typically work for
just about long enough to run their regression tests, and no longer :-(.
The pre-9.0 code in dict_xsyn was even lamer than that, as it would
happily give back a pointer to the result of palloc(0), encouraging
its caller to access off the end of memory. Again, this would just
barely fail to fail as long as memory contained nothing but zeroes.
Per a report from Rodrigo Hjort that code based on these examples
didn't work reliably.
| -rw-r--r-- | contrib/dict_int/dict_int.c | 2 | ||||
| -rw-r--r-- | contrib/dict_xsyn/dict_xsyn.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c index c4ad6ef343e..ed82d83004c 100644 --- a/contrib/dict_int/dict_int.c +++ b/contrib/dict_int/dict_int.c @@ -73,7 +73,7 @@ dintdict_lexize(PG_FUNCTION_ARGS) DictInt *d = (DictInt *) PG_GETARG_POINTER(0); char *in = (char *) PG_GETARG_POINTER(1); char *txt = pnstrdup(in, PG_GETARG_INT32(2)); - TSLexeme *res = palloc(sizeof(TSLexeme) * 2); + TSLexeme *res = palloc0(sizeof(TSLexeme) * 2); res[1].lexeme = NULL; if (PG_GETARG_INT32(2) > d->maxlen) diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c index ded20facd47..18301effc7c 100644 --- a/contrib/dict_xsyn/dict_xsyn.c +++ b/contrib/dict_xsyn/dict_xsyn.c @@ -245,6 +245,8 @@ dxsyn_lexize(PG_FUNCTION_ARGS) if (pos != value || d->keeporig) { res[nsyns].lexeme = pnstrdup(syn, end - syn); + res[nsyns].nvariant = 0; + res[nsyns].flags = 0; nsyns++; } |