Fix signed char in comparison and check memory allocation

feodor · feodor · commit 125d69cd9b2a · 2003-12-18T19:27:53.000Z
diff --git 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++;
 			}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ strnduplicate(char *s, int len) {`
`49`	`49`	`}`
`50`	`50`	`/* backward string compaire for suffix tree operations */`
`51`	`51`	`static int`
`52`		`-strbcmp(const char s1, const char s2)`
	`52`	`+strbcmp(const unsigned char s1, const unsigned char s2)`
`53`	`53`	`{`
`54`	`54`	`int l1 = strlen(s1) - 1,`
`55`	`55`	`l2 = strlen(s2) - 1;`
`@@ -71,7 +71,7 @@ strbcmp(const char s1, const char s2)`
`71`	`71`	`return 0;`
`72`	`72`	`}`
`73`	`73`	`static int`
`74`		`-strbncmp(const char s1, const char s2, size_t count)`
	`74`	`+strbncmp(const unsigned char s1, const unsigned char s2, size_t count)`
`75`	`75`	`{`
`76`	`76`	`int l1 = strlen(s1) - 1,`
`77`	`77`	`l2 = strlen(s2) - 1,`
`@@ -536,9 +536,10 @@ mkANode(IspellDict *Conf, int low, int high, int level, int type) {`
`536`	`536`	`}`
`537`	`537`	`data->val=GETCHAR( Conf->Affix + i, level, type );`
`538`	`538`	`if ( Conf->Affix[i].replen == level+1 ) { /* affix stopped */`
`539`		`- if ( !data->naff )`
	`539`	`+ if ( !data->naff ) {`
`540`	`540`	`data->aff=(AFFIX*)malloc(sizeof(AFFIX)*(high-i+1));`
`541`		`- MEMOUT(data);`
	`541`	`+ MEMOUT(data->aff);`
	`542`	`+ }`
`542`	`543`	`data->aff[ data->naff ] = Conf->Affix + i;`
`543`	`544`	`data->naff++;`
`544`	`545`	`}`