itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo-credential-libsecret: give FFI correctly-sized object

Browse Source 
The type is
	typedef struct {
		const gchar *name;
		SecretSchemaFlags flags;
		SecretSchemaAttribute attributes[32];

		/* <private> */
		gint reserved;
		gpointer reserved1;
		gpointer reserved2;
		gpointer reserved3;
		gpointer reserved4;
		gpointer reserved5;
		gpointer reserved6;
		gpointer reserved7;
	} SecretSchema;
so the current object we give it is 8 pointers too short

It's incredibly lucky that libsecret, at this time,
only uses reserved, and not in any of the functions we call
This commit is contained in:
наб 2025-07-22 22:46:22 +02:00
parent 219a4da303
commit 1abdb1d2aa
No known key found for this signature in database
GPG Key ID: BCFD0B018D2658F1
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
credential/cargo-credential-libsecret/src/lib.rs
View File

@ -22,6 +22,12 @@ mod linux {
#[allow(non_camel_case_types)]
type gboolean = c_int;
#[allow(non_camel_case_types)]
type gint = c_int;
#[allow(non_camel_case_types)]
type gpointer = *mut ();
type GQuark = u32;
#[repr(C)]
@ -41,6 +47,14 @@ mod linux {
name: *const gchar,
flags: SecretSchemaFlags,
attributes: [SecretSchemaAttribute; 32],
reserved: gint,
reserved1: gpointer,
reserved2: gpointer,
reserved3: gpointer,
reserved4: gpointer,
reserved5: gpointer,
reserved6: gpointer,
reserved7: gpointer,
}
#[repr(C)]
@ -104,6 +118,14 @@ mod linux {
name: b"org.rust-lang.cargo.registry\0".as_ptr() as *const gchar,
flags: SecretSchemaFlags::None,
attributes,
reserved: 0,
reserved1: null_mut(),
reserved2: null_mut(),
reserved3: null_mut(),
reserved4: null_mut(),
reserved5: null_mut(),
reserved6: null_mut(),
reserved7: null_mut(),
}
}