Commit 247e567422a0efde2ed1f2cbf1b16f217f2b61d9 | zig

author	hryx <codroid@gmail.com> 2019-06-28 18:01:41-07:00
committer	hryx <codroid@gmail.com> 2019-06-28 18:01:41-07:00
log	247e567422a0efde2ed1f2cbf1b16f217f2b61d9
tree	6d1e1e7e4558b6427a35673d7e1601ee1dede283
parent	102bf5200cfd82c1df6d503059e70c37b4925361
signature	Commit is signed but in an unrecognized format.

Don't return a slice pointing to a deceased stack address

1 files changed, 15 insertions(+), 12 deletions(-)

src-self-hosted
- translate_c.zig

src-self-hosted/translate_c.zig+15-12

 @@ -691,8 +691,9 @@ fn transStringLiteral(
             const bytes_ptr = ZigClangStringLiteral_getString_bytes_begin_size(stmt, &len);
             const str = bytes_ptr[0..len];
+            var char_buf: [4]u8 = undefined;
             len = 0;
-            for (str) |c| len += escapeChar(c).len;
+            for (str) |c| len += escapeChar(c, &char_buf).len;
             const buf = try rp.c.a().alloc(u8, len + "c\"\"".len);
             buf[0] = 'c';
 @@ -725,33 +726,35 @@ fn transStringLiteral(
 fn escapedStringLen(s: []const u8) usize {
     var len: usize = 0;
-    for (s) |c| len += escapeChar(c).len;
+    var char_buf: [4]u8 = undefined;
+    for (s) |c| len += escapeChar(c, &char_buf).len;
     return len;
 }
 fn writeEscapedString(buf: []u8, s: []const u8) void {
+    var char_buf: [4]u8 = undefined;
     var i: usize = 0;
     for (s) |c| {
-        const escaped = escapeChar(c);
+        const escaped = escapeChar(c, &char_buf);
         std.mem.copy(u8, buf[i..], escaped);
         i += escaped.len;
     }
 }
-fn escapeChar(c: u8) []const u8 {
+// Returns either a string literal or a slice of `buf`.
+fn escapeChar(c: u8, char_buf: *[4]u8) []const u8 {
     // TODO: https://github.com/ziglang/zig/issues/2749
-    switch (c) {
+    const escaped = switch (c) {
         // Printable ASCII except for ' " \
-        ' ', '!', '#'...'&', '('...'[', ']'...'~' => return ([_]u8{c})[0..],
+        ' ', '!', '#'...'&', '('...'[', ']'...'~' => ([_]u8{c})[0..],
-        '\'', '\"', '\\' => return ([_]u8{ '\\', c })[0..],
+        '\'', '\"', '\\' => ([_]u8{ '\\', c })[0..],
         '\n' => return "\\n"[0..],
         '\r' => return "\\r"[0..],
         '\t' => return "\\t"[0..],
-        else => {
+        else => return std.fmt.bufPrint(char_buf[0..], "\\x{x:2}", c) catch unreachable,
-            var buf: [4]u8 = undefined;
+    };
-            return std.fmt.bufPrint(buf[0..], "\\x{x:2}", c) catch unreachable;
+    std.mem.copy(u8, char_buf, escaped);
-        },
+    return char_buf[0..escaped.len];
-    }
 }
 fn transCCast(