gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix region checks (#11651)

Browse Source
This commit is contained in:
Jack May
2020-08-16 23:11:52 -07:00
committed by GitHub
parent 23fa84b322
commit 768b386f0a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/bpf_loader/src/syscalls.rs
View File

@ -365,10 +365,10 @@ pub fn syscall_create_program_address(
) )
}) })
.collect::<Result<Vec<_>, EbpfError<BPFError>>>()?; .collect::<Result<Vec<_>, EbpfError<BPFError>>>()?;
let program_id = translate_type!(Pubkey, program_id_addr, rw_regions)?; let program_id = translate_type!(Pubkey, program_id_addr, ro_regions)?;
let new_address = let new_address =
Pubkey::create_program_address(&seeds, program_id).map_err(SyscallError::BadSeeds)?; Pubkey::create_program_address(&seeds, program_id).map_err(SyscallError::BadSeeds)?;
let address = translate_slice_mut!(u8, address_addr, 32, ro_regions)?; let address = translate_slice_mut!(u8, address_addr, 32, rw_regions)?;
address.copy_from_slice(new_address.as_ref()); address.copy_from_slice(new_address.as_ref());
Ok(0) Ok(0)
} }

7
sdk/src/pubkey.rs
View File

@ -139,16 +139,13 @@ impl Pubkey {
address_bytes_addr: *const u8, address_bytes_addr: *const u8,
) -> u64; ) -> u64;
}; };
let bytes = [ let mut bytes = [0; 32];
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0,
];
let result = unsafe { let result = unsafe {
sol_create_program_address( sol_create_program_address(
seeds as *const _ as *const u8, seeds as *const _ as *const u8,
seeds.len() as u64, seeds.len() as u64,
program_id as *const _ as *const u8, program_id as *const _ as *const u8,
&bytes as *const _ as *const u8, &mut bytes as *mut _ as *mut u8,
) )
}; };
match result { match result {