lobo/clipboard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix memory corruption

Browse Source
This commit is contained in:
Emil Lerch 2022-01-06 14:34:45 -08:00
parent 6693db101d
commit 404d6a1800
Signed by: lobo
GPG Key ID: A7B62D657EF764F8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/crypt.zig
View File

@ -53,18 +53,20 @@ pub fn encryptWithKey(allocator: std.mem.Allocator, key: [key_size]u8, data: []u
// deal with final block, PKCS#7 padding // deal with final block, PKCS#7 padding
{ {
in = @ptrCast(*[block_size]u8, data[(total_blocks * block_size)..]); // We can't just ptrcast into data as we are likely to run over the end
// of the data memory. We'll declare a new input buffer
var in_last: [block_size]u8 = undefined;
const padding: u8 = @intCast(u8, block_size - (data.len % block_size)); const padding: u8 = @intCast(u8, block_size - (data.len % block_size));
var inx: u8 = 0; var inx: u8 = 0;
for (data[(total_blocks * block_size)..]) |b| { for (data[(total_blocks * block_size)..]) |b| {
in[inx] = b; in_last[inx] = b;
inx += 1; inx += 1;
} }
while (inx < out.len) { while (inx < out.len) {
in[inx] = padding; in_last[inx] = padding;
inx += 1; inx += 1;
} }
ctx.encrypt(out[0..], in[0..]); ctx.encrypt(out[0..], in_last[0..]);
encrypted.appendSliceAssumeCapacity(out[0..]); encrypted.appendSliceAssumeCapacity(out[0..]);
} }
return encrypted.toOwnedSlice(); return encrypted.toOwnedSlice();