Use zend_dval_to_lval() in spl_offset_convert_to_long()

nikic · nikic · commit a3d0d947bd88 · 2020-08-27T14:53:56.000+02:00
Avoid fptoi UB and use the standard PHP conversion behavior.
diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c
@@ -41,7 +41,7 @@ PHPAPI zend_long spl_offset_convert_to_long(zval *offset) /* {{{ */
 		}
 		break;
 	case IS_DOUBLE:
-		return (zend_long)Z_DVAL_P(offset);
+		return zend_dval_to_lval(Z_DVAL_P(offset));
 	case IS_LONG:
 		return Z_LVAL_P(offset);
 	case IS_FALSE:

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ PHPAPI zend_long spl_offset_convert_to_long(zval offset) / {{{ */`
`41`	`41`	`}`
`42`	`42`	`break;`
`43`	`43`	`case IS_DOUBLE:`
`44`		`- return (zend_long)Z_DVAL_P(offset);`
	`44`	`+ return zend_dval_to_lval(Z_DVAL_P(offset));`
`45`	`45`	`case IS_LONG:`
`46`	`46`	`return Z_LVAL_P(offset);`
`47`	`47`	`case IS_FALSE:`