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

Bump rbpf to 0.1.9 (#2422)

Browse Source
This commit is contained in:
Jak May
2019-01-15 00:42:30 -08:00
committed by GitHub
parent ef8e5b40b6
commit b2afd1ea0b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/native/bpf_loader/Cargo.toml
View File

@ -18,7 +18,7 @@ byteorder = "1.2.1"
elf = "0.0.10" elf = "0.0.10"
libc = "0.2.46" libc = "0.2.46"
log = "0.4.2" log = "0.4.2"
solana_rbpf = "=0.1.8" solana_rbpf = "=0.1.9"
serde = "1.0.84" serde = "1.0.84"
solana-logger = { path = "../../../logger", version = "0.12.0" } solana-logger = { path = "../../../logger", version = "0.12.0" }
solana-sdk = { path = "../../../sdk", version = "0.12.0" } solana-sdk = { path = "../../../sdk", version = "0.12.0" }

10
programs/native/bpf_loader/src/lib.rs
View File

@ -3,7 +3,7 @@ pub mod bpf_verifier;
use byteorder::{ByteOrder, LittleEndian, WriteBytesExt}; use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
use libc::c_char; use libc::c_char;
use log::*; use log::*;
use solana_rbpf::{EbpfVmRaw, RegionPtrs}; use solana_rbpf::{EbpfVmRaw, MemoryRegion};
use solana_sdk::account::KeyedAccount; use solana_sdk::account::KeyedAccount;
use solana_sdk::loader_instruction::LoaderInstruction; use solana_sdk::loader_instruction::LoaderInstruction;
use solana_sdk::native_program::ProgramError; use solana_sdk::native_program::ProgramError;
@ -36,13 +36,13 @@ pub fn helper_sol_log_verify(
unused3: u64, unused3: u64,
unused4: u64, unused4: u64,
unused5: u64, unused5: u64,
ro_regions: &[RegionPtrs], ro_regions: &[MemoryRegion],
unused7: &[RegionPtrs], unused7: &[MemoryRegion],
) -> Result<(()), Error> { ) -> Result<(()), Error> {
for region in ro_regions.iter() { for region in ro_regions.iter() {
if region.bot <= addr && addr as u64 <= region.top { if region.addr <= addr && (addr as u64) < region.addr + region.len {
let c_buf: *const c_char = addr as *const c_char; let c_buf: *const c_char = addr as *const c_char;
let max_size = region.top - addr; let max_size = region.addr + region.len - addr;
unsafe { unsafe {
for i in 0..max_size { for i in 0..max_size {
if std::ptr::read(c_buf.offset(i as isize)) == 0 { if std::ptr::read(c_buf.offset(i as isize)) == 0 {