mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 19:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash on string literal with character code >= 128

Browse Source 
See #258
This commit is contained in:
Andrew Kelley 2017-02-11 14:01:11 -05:00
parent 39287d7346
commit f7173f4f08
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/analyze.cpp
View File

@ -3038,7 +3038,7 @@ void init_const_str_lit(CodeGen *g, ConstExprValue *const_val, Buf *str) {
ConstExprValue *this_char = &const_val->data.x_array.elements[i]; ConstExprValue *this_char = &const_val->data.x_array.elements[i];
this_char->special = ConstValSpecialStatic; this_char->special = ConstValSpecialStatic;
this_char->type = g->builtin_types.entry_u8; this_char->type = g->builtin_types.entry_u8;
bignum_init_unsigned(&this_char->data.x_bignum, buf_ptr(str)[i]); bignum_init_unsigned(&this_char->data.x_bignum, (uint8_t)buf_ptr(str)[i]);
} }
} }
@ -3059,7 +3059,7 @@ void init_const_c_str_lit(CodeGen *g, ConstExprValue *const_val, Buf *str) {
ConstExprValue *this_char = &array_val->data.x_array.elements[i]; ConstExprValue *this_char = &array_val->data.x_array.elements[i];
this_char->special = ConstValSpecialStatic; this_char->special = ConstValSpecialStatic;
this_char->type = g->builtin_types.entry_u8; this_char->type = g->builtin_types.entry_u8;
bignum_init_unsigned(&this_char->data.x_bignum, buf_ptr(str)[i]); bignum_init_unsigned(&this_char->data.x_bignum, (uint8_t)buf_ptr(str)[i]);
} }
ConstExprValue *null_char = &array_val->data.x_array.elements[len_with_null - 1]; ConstExprValue *null_char = &array_val->data.x_array.elements[len_with_null - 1];
null_char->special = ConstValSpecialStatic; null_char->special = ConstValSpecialStatic;
@ -3594,11 +3594,13 @@ void render_const_value(Buf *buf, ConstExprValue *const_val) {
buf_append_char(buf, '"'); buf_append_char(buf, '"');
for (uint64_t i = 0; i < len; i += 1) { for (uint64_t i = 0; i < len; i += 1) {
ConstExprValue *child_value = &const_val->data.x_array.elements[i]; ConstExprValue *child_value = &const_val->data.x_array.elements[i];
uint64_t x = child_value->data.x_bignum.data.x_uint; uint64_t big_c = child_value->data.x_bignum.data.x_uint;
if (x == '"') { assert(big_c <= UINT8_MAX);
uint8_t c = big_c;
if (c == '"') {
buf_append_str(buf, "\\\""); buf_append_str(buf, "\\\"");
} else { } else {
buf_append_char(buf, x); buf_append_char(buf, c);
} }
} }
buf_append_char(buf, '"'); buf_append_char(buf, '"');

2
std/io.zig
View File

@ -156,7 +156,7 @@ pub const OutStream = struct {
width = 0; width = 0;
state = State.Integer; state = State.Integer;
}, },
else => @compileError("Unknown format character: " ++ c), else => @compileError("Unknown format character: " ++ []u8{c}),
}, },
State.CloseBrace => switch (c) { State.CloseBrace => switch (c) {
'}' => { '}' => {