mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix segfault in bit shift safety check

Browse Source
This commit is contained in:
Vexu 2020-01-01 15:24:46 +02:00 committed by Andrew Kelley
parent 0fb3e6608c
commit 1b64a5f5f0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ir.cpp
View File

@ -15621,11 +15621,15 @@ static IrInstruction *ir_analyze_bit_shift(IrAnalyze *ira, IrInstructionBinOp *b
op1->value->type->data.integral.bit_count - 1);
if (bin_op_instruction->op_id == IrBinOpBitShiftLeftLossy &&
op2->value->type->id == ZigTypeIdComptimeInt) {
if (!bigint_fits_in_bits(&op2->value->data.x_bigint,
ZigValue *op2_val = ir_resolve_const(ira, op2, UndefBad);
if (op2_val == nullptr)
return ira->codegen->invalid_instruction;
if (!bigint_fits_in_bits(&op2_val->data.x_bigint,
shift_amt_type->data.integral.bit_count,
op2->value->data.x_bigint.is_negative)) {
op2_val->data.x_bigint.is_negative)) {
Buf *val_buf = buf_alloc();
bigint_append_buf(val_buf, &op2->value->data.x_bigint, 10);
bigint_append_buf(val_buf, &op2_val->data.x_bigint, 10);
ErrorMsg* msg = ir_add_error(ira,
&bin_op_instruction->base,
buf_sprintf("RHS of shift is too large for LHS type"));

4
test/stage1/behavior/bit_shifting.zig
View File

@ -96,3 +96,7 @@ test "comptime shr of BigInt" {
std.debug.assert(n1 >> 64 == 0);
}
}
test "comptime shift safety check" {
const x = @as(usize, 42) << @sizeOf(usize);
}