Merge remote-tracking branch 'origin/master' into native-tls

weltling · weltling · commit 9c354ba18277 · 2014-12-17T11:53:45.000+01:00
* origin/master: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Added EXPECTED(). Most functions have arguments.
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
@@ -192,7 +192,7 @@ static zend_always_inline void zend_vm_stack_free_args(zend_execute_data *call)
 {
 	uint32_t num_args = ZEND_CALL_NUM_ARGS(call);
 
-	if (num_args > 0) {
+	if (EXPECTED(num_args > 0)) {
 		zval *end = ZEND_CALL_ARG(call, 1);
 		zval *p = end + num_args;
 
diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c
@@ -400,14 +400,14 @@ GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroD
 		scd->lastbit = (2+count)*8 ;
 	}
 
-	ret = 0;
-	for (i = scd->curbit, j = 0; j < code_size; ++i, ++j)
-		if (i < CSD_BUF_SIZE * 8) {
+	if ((scd->curbit + code_size - 1) >= (CSD_BUF_SIZE * 8)) {
+		ret = -1;
+	} else {
+		ret = 0;
+		for (i = scd->curbit, j = 0; j < code_size; ++i, ++j) {
 			ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j;
-		} else {
-			ret = -1;
-			break;
 		}
+	}
 
 	scd->curbit += code_size;
 	return ret;

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ static zend_always_inline void zend_vm_stack_free_args(zend_execute_data *call)`
`192`	`192`	`{`
`193`	`193`	`uint32_t num_args = ZEND_CALL_NUM_ARGS(call);`
`194`	`194`
`195`		`- if (num_args > 0) {`
	`195`	`+ if (EXPECTED(num_args > 0)) {`
`196`	`196`	`zval *end = ZEND_CALL_ARG(call, 1);`
`197`	`197`	`zval *p = end + num_args;`
`198`	`198`