From: Teodor Sigaev <teodor@sigaev.ru>
Date: Thu, 18 Dec 2003 19:27:53 +0000 (+0000)
Subject: Fix signed char in comparison and check memory allocation
X-Git-Tag: REL8_0_0BETA1~1493
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=125d69cd9b2a78a53b9cac811b3f028d6f1ea3d2;p=postgresql

Fix signed char in comparison and check memory allocation
---

diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
index 331204ece3..4f4b332933 100644
--- a/contrib/tsearch2/ispell/spell.c
+++ b/contrib/tsearch2/ispell/spell.c
@@ -49,7 +49,7 @@ strnduplicate(char *s, int len) {
 }
 /* backward string compaire for suffix tree operations */
 static int
-strbcmp(const char *s1, const char *s2)
+strbcmp(const unsigned char *s1, const unsigned char *s2)
 {
 	int			l1 = strlen(s1) - 1,
 				l2 = strlen(s2) - 1;
@@ -71,7 +71,7 @@ strbcmp(const char *s1, const char *s2)
 	return 0;
 }
 static int
-strbncmp(const char *s1, const char *s2, size_t count)
+strbncmp(const unsigned char *s1, const unsigned char *s2, size_t count)
 {
 	int			l1 = strlen(s1) - 1,
 				l2 = strlen(s2) - 1,
@@ -536,9 +536,10 @@ mkANode(IspellDict *Conf, int low, int high, int level, int type) {
 			}
 			data->val=GETCHAR( Conf->Affix + i, level, type );
 			if ( Conf->Affix[i].replen == level+1 ) { /* affix stopped */
-				if ( !data->naff )
+				if ( !data->naff ) {
 					data->aff=(AFFIX**)malloc(sizeof(AFFIX*)*(high-i+1));
-					MEMOUT(data);
+					MEMOUT(data->aff);
+				}
 				data->aff[ data->naff ] = Conf->Affix + i;
 				data->naff++;
 			}