summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-03-18 00:55:25 +0400
committerDmitry Stogov <dmitry@zend.com>2014-03-18 00:55:25 +0400
commit292c01d890725cb5dc1018abbee262ed03013293 (patch)
tree8808537dcd65a0b86588a2e898fe68d5167eac0d
parent53a63dbd7d7c331e93973332594cdda554da7608 (diff)
downloadphp-git-292c01d890725cb5dc1018abbee262ed03013293.tar.gz
Fixed get_browser()
-rw-r--r--ext/standard/browscap.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 0ce985a1db..e4d3c564c7 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -81,19 +81,20 @@ static void convert_browscap_pattern(zval *pattern, int persistent) /* {{{ */
int i, j=0;
char *t;
zend_string *res;
+ char *lc_pattern;
// TODO: overflow check???
//??? t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 5, persistent);
res = STR_ALLOC(Z_STRLEN_P(pattern) * 2 + 5, persistent);
t = res->val;
- php_strtolower(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
+ lc_pattern = zend_str_tolower_dup(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
t[j++] = '\xA7'; /* section sign */
t[j++] = '^';
for (i=0; i<Z_STRLEN_P(pattern); i++, j++) {
- switch (Z_STRVAL_P(pattern)[i]) {
+ switch (lc_pattern[i]) {
case '?':
t[j] = '.';
break;
@@ -122,7 +123,7 @@ static void convert_browscap_pattern(zval *pattern, int persistent) /* {{{ */
t[j] = '\xA7';
break;
default:
- t[j] = Z_STRVAL_P(pattern)[i];
+ t[j] = lc_pattern[i];
break;
}
}
@@ -133,6 +134,7 @@ static void convert_browscap_pattern(zval *pattern, int persistent) /* {{{ */
t[j]=0;
res->len = j;
Z_STR_P(pattern) = res;
+ efree(lc_pattern);
}
/* }}} */