On 11/11/2006 01:27 AM, Hannes Magnusson wrote:
Hi Nuno
This patch causes ext/date/tests/timezones.phpt to segfault...
This patch seems to fix it, though I'm not sure it's sane.
Index: ext/date/lib/parse_tz.c
===================================================================
RCS file: /repository/php-src/ext/date/lib/parse_tz.c,v
retrieving revision 1.20.2.6.2.7
diff -u -p -d -r1.20.2.6.2.7 parse_tz.c
--- ext/date/lib/parse_tz.c 10 Nov 2006 17:32:15 -0000 1.20.2.6.2.7
+++ ext/date/lib/parse_tz.c 10 Nov 2006 22:38:34 -0000
@@ -204,7 +204,11 @@ static int tz_search(char *timezone, uns
cmp = strcasecmp(timezone, tzdb->index[mid].id);
if (cmp < 0) {
- return tz_search(timezone, left, mid - 1, tzdb);
+ if (mid > 0) {
+ return tz_search(timezone, left, mid - 1, tzdb);
+ } else {
+ return -1;
+ }
} else if (cmp > 0) {
return tz_search(timezone, mid + 1, right, tzdb);
} else { /* (cmp == 0) */
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
