File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed
branches/snap-stage3/src/liballoc Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: 566b470e138e929e8a93d613372db1ba177c494f
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: b0b48511dae63b2e86d002930e54cef7c0d6009e
4
+ refs/heads/snap-stage3: b1f7d3aaa021d626b4083ddaa706b26f3521d343
5
5
refs/heads/try: 80b45ddbd351f0a4a939c3a3c4e20b4defec4b35
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
Original file line number Diff line number Diff line change @@ -208,6 +208,7 @@ mod imp {
208
208
209
209
#[ cfg( not( jemalloc) , unix) ]
210
210
mod imp {
211
+ use core:: cmp;
211
212
use core:: mem;
212
213
use core:: ptr;
213
214
use libc;
@@ -248,7 +249,7 @@ mod imp {
248
249
pub unsafe fn reallocate ( ptr : * mut u8 , size : uint , align : uint ,
249
250
old_size : uint ) -> * mut u8 {
250
251
let new_ptr = allocate ( size, align) ;
251
- ptr:: copy_memory ( new_ptr, ptr as * const u8 , old_size) ;
252
+ ptr:: copy_memory ( new_ptr, ptr as * const u8 , cmp :: min ( size , old_size) ) ;
252
253
deallocate ( ptr, old_size, align) ;
253
254
return new_ptr;
254
255
}
You can’t perform that action at this time.
0 commit comments