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

std: support deserialising JSON strings containing escape seqences into sentinel slice

Browse Source
This commit is contained in:
Leo Constantinides 2023-02-13 13:44:34 +00:00 committed by GitHub
parent f62e3b8c0d
commit 25d6b8c1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/json.zig
View File

@ -1678,19 +1678,16 @@ fn parseInternal(
if (ptrInfo.child != u8) return error.UnexpectedToken;
const source_slice = stringToken.slice(tokens.slice, tokens.i - 1);
const len = stringToken.decodedLength();
const output = try allocator.alloc(u8, len + @boolToInt(ptrInfo.sentinel != null));
const output = if (ptrInfo.sentinel) |sentinel_ptr|
try allocator.allocSentinel(u8, len, @ptrCast(*const u8, sentinel_ptr).*)
else
try allocator.alloc(u8, len);
errdefer allocator.free(output);
switch (stringToken.escapes) {
.None => mem.copy(u8, output, source_slice),
.Some => try unescapeValidString(output, source_slice),
}
if (ptrInfo.sentinel) |some| {
const char = @ptrCast(*const u8, some).*;
output[len] = char;
return output[0..len :char];
}
return output;
},
else => return error.UnexpectedToken,
@ -2684,3 +2681,16 @@ test "encodesTo" {
try testing.expectEqual(true, encodesTo("😂", "\\ud83d\\ude02"));
try testing.expectEqual(true, encodesTo("withąunicode😂", "with\\u0105unicode\\ud83d\\ude02"));
}
test "issue 14600" {
const json = "\"\\n\"";
var token_stream = std.json.TokenStream.init(json);
const options = ParseOptions{ .allocator = std.testing.allocator };
// Pre-fix, this line would panic:
const result = try std.json.parse([:0]const u8, &token_stream, options);
defer std.json.parseFree([:0]const u8, result, options);
// Double-check that we're getting the right result
try testing.expect(mem.eql(u8, result, "\n"));
}