tony2001 Wed Sep 27 08:31:36 2006 UTC
Modified files:
/php-src/ext/standard metaphone.c
Log:
fix #38961 (metaphone() results in segmentation fault on NetBSD)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.31
php-src/ext/standard/metaphone.c:1.32
--- php-src/ext/standard/metaphone.c:1.31 Tue Sep 26 15:40:59 2006
+++ php-src/ext/standard/metaphone.c Wed Sep 27 08:31:35 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: metaphone.c,v 1.31 2006/09/26 15:40:59 iliaa Exp $ */
+/* $Id: metaphone.c,v 1.32 2006/09/27 08:31:35 tony2001 Exp $ */
/*
Based on CPANs "Text-Metaphone-1.96" by Michael G Schwern <[EMAIL
PROTECTED]>
@@ -25,7 +25,7 @@
#include "php.h"
#include "php_metaphone.h"
-static int metaphone(char *word, int word_len, long max_phonemes, char
**phoned_word, int traditional);
+static int metaphone(unsigned char *word, int word_len, long max_phonemes,
char **phoned_word, int traditional);
/* {{{ proto string metaphone(string text[, int phones])
Break english phrases down into their phonemes */
@@ -41,7 +41,7 @@
return;
}
- if (metaphone(str, str_len, phones, &result, 1) == 0) {
+ if (metaphone((unsigned char *)str, str_len, phones, &result, 1) == 0) {
RETVAL_STRING(result, 0);
} else {
if (result) {
@@ -159,7 +159,7 @@
/* {{{ metaphone
*/
-static int metaphone(char *word, int word_len, long max_phonemes, char
**phoned_word, int traditional)
+static int metaphone(unsigned char *word, int word_len, long max_phonemes,
char **phoned_word, int traditional)
{
int w_idx = 0; /* point in the phonization
we're at. */
int p_idx = 0; /* end of the phoned phrase */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
