Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Ran wrong tests, fixed bug in impl; simplified

  • Loading branch information...
commit 1a7bf16dd6299bf6a5745f28edf50a44dc83dba2 1 parent bb55290
@bwoebi bwoebi authored
Showing with 9 additions and 1 deletion.
  1. +9 −1 ext/standard/string.c
View
10 ext/standard/string.c
@@ -1223,9 +1223,17 @@ PHPAPI void php_implode(const zend_string *delim, zval *arr, zval *return_value)
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(arr), tmp) {
if (Z_TYPE_P(tmp) == IS_LONG) {
+ double val = Z_LVAL_P(tmp);
*++strptr = NULL;
((zend_long *) (strings + numelems))[strptr - strings] = Z_LVAL_P(tmp);
- len += (int) log10(Z_LVAL_P(tmp) < 0 ? -100 * ((double) Z_LVAL_P(tmp) - 0.001) : 10 * ((double) Z_LVAL_P(tmp) + 0.01));
+ if (val < 0) {
+ val = -10 * val;
+ }
+ if (val < 10) {
+ len++;
+ } else {
+ len += (int) log10(10 * (double) val);
+ }
} else {
*++strptr = zval_get_string(tmp);
len += (*strptr)->len;
Please sign in to comment.
Something went wrong with that request. Please try again.