Merge pull request #1155 from smowton/smowton/fix/interpreter_alloc_size

thk123 · web-flow · commit 7379da48126e · 2017-07-20T10:13:07.000+01:00
Fix interpreter allocation sizing
diff --git a/src/goto-programs/interpreter_class.h b/src/goto-programs/interpreter_class.h
@@ -145,7 +145,7 @@ class interpretert:public messaget
       return 0;
     std::size_t ret=0;
     std::size_t alloc_size=base_address_to_alloc_size(address);
-    while(memory_iter!=memory.end() && ret<alloc_size)
+    while(memory_iter!=memory.end() && memory_iter->first<(address+alloc_size))
     {
       ++ret;
       ++memory_iter;

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ class interpretert:public messaget`
`145`	`145`	`return 0;`
`146`	`146`	`std::size_t ret=0;`
`147`	`147`	`std::size_t alloc_size=base_address_to_alloc_size(address);`
`148`		`- while(memory_iter!=memory.end() && ret<alloc_size)`
	`148`	`+ while(memory_iter!=memory.end() && memory_iter->first<(address+alloc_size))`
`149`	`149`	`{`
`150`	`150`	`++ret;`
`151`	`151`	`++memory_iter;`