postgres.git / summary / log / commit / refs

commit    3fbfd40b37eaf2db8698df1b5e41bc0fd6c80b51
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Nov 03 23:17:59 2011 +0000
First released in: 9.2.0, 8.3.17, 8.4.10, 9.0.6, 9.1.2

    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.


 contrib/dict_int/dict_int.c   | 2 +-
 contrib/dict_xsyn/dict_xsyn.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index 8e1918613f7..e478e680934 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 dc16d9583e2..656271fa47c 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++;
 			}
 


[parent: 9b3c35a9db41]