Skip to content

Commit 28f6a2b

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Avoid ASAN integer overflow warnings
2 parents de1a1d5 + 15abbea commit 28f6a2b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/opcache/jit/dynasm/dasm_x86.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ int dasm_encode(Dst_DECL, void *buffer)
416416
if (*p != DASM_IMM_DB && *p != DASM_IMM_WB) mark = NULL;
417417
if (n == 0) { int mrm = mm[-1]&7; if (mrm == 4) mrm = mm[0]&7;
418418
if (mrm != 5) { mm[-1] -= 0x80; break; } }
419-
if (((n+128) & -256) != 0) goto wd; else mm[-1] -= 0x40;
419+
if ((((unsigned)n+128) & -256) != 0) goto wd; else mm[-1] -= 0x40;
420420
}
421421
/* fallthrough */
422422
case DASM_IMM_S: case DASM_IMM_B: wb: dasmb(n); break;
@@ -425,7 +425,7 @@ int dasm_encode(Dst_DECL, void *buffer)
425425
} else mark = NULL;
426426
/* fallthrough */
427427
case DASM_IMM_D: wd: dasmd(n); break;
428-
case DASM_IMM_WB: if (((n+128)&-256) == 0) goto db; else mark = NULL;
428+
case DASM_IMM_WB: if ((((unsigned)n+128)&-256) == 0) goto db; else mark = NULL;
429429
/* fallthrough */
430430
case DASM_IMM_W: dasmw(n); break;
431431
case DASM_VREG: {

0 commit comments

Comments
 (0)