]>
Commit | Line | Data |
---|---|---|
6d4f6187 ER |
1 | --- a/Zend/zend_alloc_canary.c |
2 | +++ b/Zend/zend_alloc_canary.c | |
3 | @@ -720,7 +720,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size) | |
4 | #elif defined(__GNUC__) && defined(__x86_64__) | |
5 | unsigned long n; | |
6 | ||
7 | - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
8 | + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
9 | return (unsigned int)n; | |
10 | #elif defined(_MSC_VER) && defined(_M_IX86) | |
11 | __asm { | |
12 | @@ -746,12 +746,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size) | |
13 | #elif defined(__GNUC__) && defined(__x86_64__) | |
14 | unsigned long n; | |
15 | ||
16 | - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
17 | + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
18 | return (unsigned int)n; | |
19 | #elif defined(_MSC_VER) && defined(_M_IX86) | |
20 | __asm { | |
21 | bsf eax, _size | |
22 | - } | |
23 | + } | |
24 | #else | |
25 | static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; | |
26 | unsigned int n; | |
27 | @@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | |
28 | size_t res = nmemb; | |
29 | unsigned long overflow = 0; | |
30 | ||
31 | - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" | |
32 | +#ifdef __ILP32__ /* x32 */ | |
33 | +# define LP_SUFF "l" | |
34 | +#else /* amd64 */ | |
35 | +# define LP_SUFF "q" | |
36 | +#endif | |
37 | + | |
38 | + __asm__ ("mul" LP_SUFF " %3\n\t" | |
39 | + "add %4,%0\n\t" | |
40 | + "adc %1,%1" | |
41 | : "=&a"(res), "=&d" (overflow) | |
42 | : "%0"(res), | |
43 | "rm"(size), | |
44 | "rm"(offset)); | |
45 | ||
46 | +#undef LP_SUFF | |
47 | + | |
48 | if (UNEXPECTED(overflow)) { | |
49 | zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | |
50 | return 0; |