blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix sol_get_processed_sibling_instruction on 32-bit hosts (#26522)

This commit is contained in:
Richard Patel 2022-08-05 21:06:03 +02:00 committed by GitHub
parent 80527e9c59
commit a9a3c62907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/bpf_loader/src/syscalls/mod.rs
View File

@ -1750,8 +1750,9 @@ declare_syscall!(
result
);
if *data_len == instruction_context.get_instruction_data().len()
&& *accounts_len == instruction_context.get_number_of_instruction_accounts()
if *data_len == (instruction_context.get_instruction_data().len() as u64)
&& *accounts_len
== (instruction_context.get_number_of_instruction_accounts() as u64)
{
let program_id = question_mark!(
translate_type_mut::<Pubkey>(
@ -1809,8 +1810,8 @@ declare_syscall!(
);
accounts.clone_from_slice(account_metas.as_slice());
}
*data_len = instruction_context.get_instruction_data().len();
*accounts_len = instruction_context.get_number_of_instruction_accounts();
*data_len = instruction_context.get_instruction_data().len() as u64;
*accounts_len = instruction_context.get_number_of_instruction_accounts() as u64;
*result = Ok(true as u64);
return;
}

8
sdk/program/src/instruction.rs
View File

@ -664,9 +664,9 @@ impl CompiledInstruction {
#[derive(Default, Debug, Clone, Copy)]
pub struct ProcessedSiblingInstruction {
/// Length of the instruction data
pub data_len: usize,
pub data_len: u64,
/// Number of AccountMeta structures
pub accounts_len: usize,
pub accounts_len: u64,
}
/// Returns a sibling instruction from the processed sibling instruction list.
@ -698,8 +698,8 @@ pub fn get_processed_sibling_instruction(index: usize) -> Option<Instruction> {
} {
let mut data = Vec::new();
let mut accounts = Vec::new();
data.resize_with(meta.data_len, u8::default);
accounts.resize_with(meta.accounts_len, AccountMeta::default);
data.resize_with(meta.data_len as usize, u8::default);
accounts.resize_with(meta.accounts_len as usize, AccountMeta::default);
let _ = unsafe {
crate::syscalls::sol_get_processed_sibling_instruction(