zoriya/zig-wayland
1
0
Fork 0
mirror of https://github.com/zoriya/zig-wayland.git synced 2026-06-01 10:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

scanner: fix wl.Registry.bind() versioning safeguard

Browse Source 
Currently we are only capping the version of the client side object
created, not the version we tell the server to create. Obviously, this
is a problem.
This commit is contained in:
Isaac Freund
2022-05-19 22:36:22 +02:00
parent 1767128453
commit 0a0cca2f90
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scanner.zig
+9 -5
View File
@@ -873,10 +873,15 @@ const Message = struct {
} else {
try writer.writeAll(") !*T {");
}
if (side == .server)
try writer.writeAll("const _resource = @ptrCast(*server.wl.Resource,_")
else
if (side == .server) {
try writer.writeAll("const _resource = @ptrCast(*server.wl.Resource,_");
} else {
// wl_registry.bind for example needs special handling
if (message.kind == .constructor and message.kind.constructor == null) {
try writer.writeAll("const version_to_construct = std.math.min(T.generated_version, _version);");
}
try writer.writeAll("const _proxy = @ptrCast(*client.wl.Proxy,_");
}
try writer.print("{});", .{fmtId(trimPrefix(interface.name))});
if (message.args.len > 0) {
try writer.writeAll("var _args = [_]common.Argument{");
@@ -917,7 +922,7 @@ const Message = struct {
if (new_iface == null) {
try writer.writeAll(
\\.{ .s = T.getInterface().name },
\\.{ .u = _version },
\\.{ .u = version_to_construct },
);
}
try writer.writeAll(".{ .o = null },");
@@ -943,7 +948,6 @@ const Message = struct {
});
} else {
try writer.print(
\\const version_to_construct = std.math.min(T.generated_version, _version);
\\return @ptrCast(*T, try _proxy.marshalConstructorVersioned({[opcode]}, &_args, T.getInterface(), version_to_construct));
, .{
.opcode = opcode,