From b2afd1ea0b40a6d42ebc5b762865f6efc0dcddbe Mon Sep 17 00:00:00 2001
From: Jak May <jack@solana.com>
Date: Tue, 15 Jan 2019 00:42:30 -0800
Subject: [PATCH] Bump rbpf to 0.1.9 (#2422)

---
 programs/native/bpf_loader/Cargo.toml |  2 +-
 programs/native/bpf_loader/src/lib.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/native/bpf_loader/Cargo.toml
index 85f0cb69d5..fa2ce6600f 100644
--- a/programs/native/bpf_loader/Cargo.toml
+++ b/programs/native/bpf_loader/Cargo.toml
@@ -18,7 +18,7 @@ byteorder = "1.2.1"
 elf = "0.0.10"
 libc = "0.2.46"
 log = "0.4.2"
-solana_rbpf = "=0.1.8"
+solana_rbpf = "=0.1.9"
 serde = "1.0.84"
 solana-logger = { path = "../../../logger", version = "0.12.0" }
 solana-sdk = { path = "../../../sdk", version = "0.12.0" }
diff --git a/programs/native/bpf_loader/src/lib.rs b/programs/native/bpf_loader/src/lib.rs
index 6caffcd13d..f16cc4f679 100644
--- a/programs/native/bpf_loader/src/lib.rs
+++ b/programs/native/bpf_loader/src/lib.rs
@@ -3,7 +3,7 @@ pub mod bpf_verifier;
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
 use libc::c_char;
 use log::*;
-use solana_rbpf::{EbpfVmRaw, RegionPtrs};
+use solana_rbpf::{EbpfVmRaw, MemoryRegion};
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::loader_instruction::LoaderInstruction;
 use solana_sdk::native_program::ProgramError;
@@ -36,13 +36,13 @@ pub fn helper_sol_log_verify(
     unused3: u64,
     unused4: u64,
     unused5: u64,
-    ro_regions: &[RegionPtrs],
-    unused7: &[RegionPtrs],
+    ro_regions: &[MemoryRegion],
+    unused7: &[MemoryRegion],
 ) -> Result<(()), Error> {
     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 max_size = region.top - addr;
+            let max_size = region.addr + region.len - addr;
             unsafe {
                 for i in 0..max_size {
                     if std::ptr::read(c_buf.offset(i as isize)) == 0 {