archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

catching up with the git history

Browse source
This commit is contained in:
Anatol Belski 2015-03-17 21:08:26 +01:00
parent 9903767734
commit 0ac1075002
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Zend/zend_strtod.c
View file

@ -619,6 +619,10 @@ Balloc
x = 1 << k; x = 1 << k;
#ifdef Omit_Private_Memory #ifdef Omit_Private_Memory
rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong)); rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
if (!rv) {
FREE_DTOA_LOCK(0);
zend_error(E_ERROR, "Balloc() failed to allocate memory");
}
#else #else
len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
/sizeof(double); /sizeof(double);
@ -628,6 +632,10 @@ Balloc
} }
else else
rv = (Bigint*)MALLOC(len*sizeof(double)); rv = (Bigint*)MALLOC(len*sizeof(double));
if (!rv) {
FREE_DTOA_LOCK(0);
zend_error(E_ERROR, "Balloc() failed to allocate memory");
}
#endif #endif
rv->k = k; rv->k = k;
rv->maxwds = x; rv->maxwds = x;
@ -2553,7 +2561,7 @@ zend_strtod
int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1; int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1;
int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign; int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign;
CONST char *s, *s0, *s1; CONST char *s, *s0, *s1;
double aadj, aadj1; volatile double aadj, aadj1;
Long L; Long L;
U aadj2, adj, rv, rv0; U aadj2, adj, rv, rv0;
ULong y, z; ULong y, z;
@ -3756,9 +3764,9 @@ zend_dtoa
to hold the suppressed trailing zeros. to hold the suppressed trailing zeros.
*/ */
int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1, int bbits, b2, b5, be, dig, i, ieps, ilim = 0, ilim0, ilim1,
j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
spec_case, try_quick; spec_case = 0, try_quick;
Long L; Long L;
#ifndef Sudden_Underflow #ifndef Sudden_Underflow
int denorm; int denorm;