Merge branch 'PHP-5.5' into PHP-5.6

hikari-no-yume · hikari-no-yume · commit 51771ed238fd · 2014-12-13T22:30:19.000Z
* PHP-5.5:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c
@@ -117,11 +117,11 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len
 		ca = *ap; cb = *bp;
 
 		/* skip over leading zeros */
-		while (leading && ca == '0' && (ap+1 < aend) && isdigit(*(ap+1))) {
+		while (leading && ca == '0' && (ap+1 < aend) && isdigit((int)(unsigned char)*(ap+1))) {
 			ca = *++ap;
 		}
 
-		while (leading && cb == '0' && (bp+1 < bend) && isdigit(*(bp+1))) {
+		while (leading && cb == '0' && (bp+1 < bend) && isdigit((int)(unsigned char)*(bp+1))) {
 			cb = *++bp;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ PHPAPI int strnatcmp_ex(char const a, size_t a_len, char const b, size_t b_len`
`117`	`117`	`ca = ap; cb = bp;`
`118`	`118`
`119`	`119`	`/* skip over leading zeros */`
`120`		`- while (leading && ca == '0' && (ap+1 < aend) && isdigit(*(ap+1))) {`
	`120`	`+ while (leading && ca == '0' && (ap+1 < aend) && isdigit((int)(unsigned char)*(ap+1))) {`
`121`	`121`	`ca = *++ap;`
`122`	`122`	`}`
`123`	`123`
`124`		`- while (leading && cb == '0' && (bp+1 < bend) && isdigit(*(bp+1))) {`
	`124`	`+ while (leading && cb == '0' && (bp+1 < bend) && isdigit((int)(unsigned char)*(bp+1))) {`
`125`	`125`	`cb = *++bp;`
`126`	`126`	`}`
`127`	`127`