Skip to content

Commit 87624c3

Browse files
committed
---
yaml --- r: 184033 b: refs/heads/auto c: 2953710 h: refs/heads/master i: 184031: f21deee v: v3
1 parent 4bb94a6 commit 87624c3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: aaf4176f0f7b072487d8f6ca4720d6da6315b23f
13+
refs/heads/auto: 2953710d26515ee2832ae6f705f51d00526fa018
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libflate/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ pub struct Bytes {
4545
impl Deref for Bytes {
4646
type Target = [u8];
4747
fn deref(&self) -> &[u8] {
48-
unsafe { slice::from_raw_parts_mut(self.ptr.ptr, self.len) }
48+
unsafe { slice::from_raw_parts(*self.ptr, self.len) }
4949
}
5050
}
5151

5252
impl Drop for Bytes {
5353
fn drop(&mut self) {
54-
unsafe { libc::free(self.ptr.ptr as *mut _); }
54+
unsafe { libc::free(*self.ptr as *mut _); }
5555
}
5656
}
5757

@@ -84,7 +84,7 @@ fn deflate_bytes_internal(bytes: &[u8], flags: c_int) -> Option<Bytes> {
8484
&mut outsz,
8585
flags);
8686
if !res.is_null() {
87-
let res = Unique(res as *mut u8);
87+
let res = Unique::new(res as *mut u8);
8888
Some(Bytes { ptr: res, len: outsz as uint })
8989
} else {
9090
None
@@ -110,7 +110,7 @@ fn inflate_bytes_internal(bytes: &[u8], flags: c_int) -> Option<Bytes> {
110110
&mut outsz,
111111
flags);
112112
if !res.is_null() {
113-
let res = Unique(res as *mut u8);
113+
let res = Unique::new(res as *mut u8);
114114
Some(Bytes { ptr: res, len: outsz as uint })
115115
} else {
116116
None

0 commit comments

Comments
 (0)