com php-src: Merge branch 'PHP-5.6': ext/gmp/gmp.c
| From: | Nikita Popov | Date: | Tue, 02 Sep 2014 17:07:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/gmp/gmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81376@lists.php.net to get a copy of this message | ||
Commit: 2d364747caf1b2270fe389bf1d3117c423e0e166
Author: Nikita Popov <nikic@php.net> Tue, 2 Sep 2014 19:07:54 +0200
Parents: 5138f3ba22e3dd5ee33fea9817a2c4c845b3ea55 834daa455bc9c8cde178c6978dcb548119b038e8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d364747caf1b2270fe389bf1d3117c423e0e166
Log:
Merge branch 'PHP-5.6'
Conflicts:
ext/gmp/gmp.c
Changed paths:
MM ext/gmp/gmp.c
Diff:
diff --cc ext/gmp/gmp.c
index d76d095,619f1c3..84f6bd4
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -733,18 -770,16 +733,16 @@@ static int convert_to_gmp(mpz_t gmpnumb
}
case IS_STRING: {
char *numstr = Z_STRVAL_P(val);
- int skip_lead = 0;
+ zend_bool skip_lead = 0;
int ret;
- if (Z_STRLEN_P(val) > 2) {
- if (numstr[0] == '0') {
- if (numstr[1] == 'x' || numstr[1] == 'X') {
- base = 16;
- skip_lead = 1;
- } else if (base != 16 && (numstr[1] == 'b' || numstr[1] == 'B')) {
- base = 2;
- skip_lead = 1;
- }
+ if (Z_STRLEN_P(val) > 2 && numstr[0] == '0') {
+ if ((base == 0 || base == 16) && (numstr[1] == 'x' || numstr[1] ==
'X')) {
+ base = 16;
+ skip_lead = 1;
+ } else if ((base == 0 || base == 2) && (numstr[1] == 'b' || numstr[1] ==
'B')) {
+ base = 2;
+ skip_lead = 1;
}
}