Commit 375e740

authored

Change implicit enum return value checks to explicit checks (#10703)

1 parent f0cfebc commit 375e740Copy full SHA for 375e740

File tree

2 files changed

-7

lines changed

ext
- opcache
  - ZendAccelerator.c
- standard
  - filters.c

2 files changed

-7

lines changed

`‎ext/opcache/ZendAccelerator.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4014,7 +4014,7 @@ static void preload_link(void)`
`4014`	`4014`	`zend_error_at(`
`4015`	`4015`	`E_WARNING, ce->info.user.filename, ce->info.user.line_start,`
`4016`	`4016`	`"Can't preload already declared class %s", ZSTR_VAL(ce->name));`
`4017`		`- } else if (preload_resolve_deps(&error, ce)) {`
	`4017`	`+ } else if (preload_resolve_deps(&error, ce)==FAILURE) {`
`4018`	`4018`	`zend_error_at(`
`4019`	`4019`	`E_WARNING, ce->info.user.filename, ce->info.user.line_start,`
`4020`	`4020`	`"Can't preload unlinked class %s: %s%s",`

`‎ext/standard/filters.c‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1187,15 +1187,15 @@ static php_conv php_conv_open(int conv_mode, const HashTable options, int pers`
`1187`	`1187`	`}`
`1188`	`1188`	`retval = pemalloc(sizeof(php_conv_base64_encode), persistent);`
`1189`	`1189`	`if (lbchars != NULL) {`
`1190`		`- if (php_conv_base64_encode_ctor((php_conv_base64_encode *)retval, line_len, lbchars, lbchars_len, 1, persistent)) {`
	`1190`	`+ if (php_conv_base64_encode_ctor((php_conv_base64_encode *)retval, line_len, lbchars, lbchars_len, 1, persistent)!=PHP_CONV_ERR_SUCCESS) {`
`1191`	`1191`	`if (lbchars != NULL) {`
`1192`	`1192`	`pefree(lbchars, 0);`
`1193`	`1193`	`}`
`1194`	`1194`	`goto out_failure;`
`1195`	`1195`	`}`
`1196`	`1196`	`pefree(lbchars, 0);`
`1197`	`1197`	`} else {`
`1198`		`- if (php_conv_base64_encode_ctor((php_conv_base64_encode *)retval, 0, NULL, 0, 0, persistent)) {`
	`1198`	`+ if (php_conv_base64_encode_ctor((php_conv_base64_encode *)retval, 0, NULL, 0, 0, persistent)!=PHP_CONV_ERR_SUCCESS) {`
`1199`	`1199`	`goto out_failure;`
`1200`	`1200`	`}`
`1201`	`1201`	`}`
`@@ -1239,13 +1239,13 @@ static php_conv php_conv_open(int conv_mode, const HashTable options, int pers`
`1239`	`1239`	`}`
`1240`	`1240`	`retval = pemalloc(sizeof(php_conv_qprint_encode), persistent);`
`1241`	`1241`	`if (lbchars != NULL) {`
`1242`		`- if (php_conv_qprint_encode_ctor((php_conv_qprint_encode *)retval, line_len, lbchars, lbchars_len, 1, opts, persistent)) {`
	`1242`	`+ if (php_conv_qprint_encode_ctor((php_conv_qprint_encode *)retval, line_len, lbchars, lbchars_len, 1, opts, persistent)!=PHP_CONV_ERR_SUCCESS) {`
`1243`	`1243`	`pefree(lbchars, 0);`
`1244`	`1244`	`goto out_failure;`
`1245`	`1245`	`}`
`1246`	`1246`	`pefree(lbchars, 0);`
`1247`	`1247`	`} else {`
`1248`		`- if (php_conv_qprint_encode_ctor((php_conv_qprint_encode *)retval, 0, NULL, 0, 0, opts, persistent)) {`
	`1248`	`+ if (php_conv_qprint_encode_ctor((php_conv_qprint_encode *)retval, 0, NULL, 0, 0, opts, persistent)!=PHP_CONV_ERR_SUCCESS) {`
`1249`	`1249`	`goto out_failure;`
`1250`	`1250`	`}`
`1251`	`1251`	`}`
`@@ -1262,13 +1262,13 @@ static php_conv php_conv_open(int conv_mode, const HashTable options, int pers`
`1262`	`1262`
`1263`	`1263`	`retval = pemalloc(sizeof(php_conv_qprint_decode), persistent);`
`1264`	`1264`	`if (lbchars != NULL) {`
`1265`		`- if (php_conv_qprint_decode_ctor((php_conv_qprint_decode *)retval, lbchars, lbchars_len, 1, persistent)) {`
	`1265`	`+ if (php_conv_qprint_decode_ctor((php_conv_qprint_decode *)retval, lbchars, lbchars_len, 1, persistent)!=PHP_CONV_ERR_SUCCESS) {`
`1266`	`1266`	`pefree(lbchars, 0);`
`1267`	`1267`	`goto out_failure;`
`1268`	`1268`	`}`
`1269`	`1269`	`pefree(lbchars, 0);`
`1270`	`1270`	`} else {`
`1271`		`- if (php_conv_qprint_decode_ctor((php_conv_qprint_decode *)retval, NULL, 0, 0, persistent)) {`
	`1271`	`+ if (php_conv_qprint_decode_ctor((php_conv_qprint_decode *)retval, NULL, 0, 0, persistent)!=PHP_CONV_ERR_SUCCESS) {`
`1272`	`1272`	`goto out_failure;`
`1273`	`1273`	`}`
`1274`	`1274`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 375e740

File tree

2 files changed

2 files changed

`‎ext/opcache/ZendAccelerator.c‎`

`‎ext/standard/filters.c‎`

0 commit comments