Skip to content

Fix crashes in Unsafe[Raw]BufferPointer with nil baseAddress. #22521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions stdlib/public/core/UnsafeBufferPointer.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,8 @@ extension Unsafe${Mutable}BufferPointer {
/// - Parameter slice: The buffer slice to rebase.
@inlinable // unsafe-performance
public init(rebasing slice: Slice<UnsafeBufferPointer<Element>>) {
self.init(start: slice.base.baseAddress! + slice.startIndex,
count: slice.count)
let base = slice.base.baseAddress?.advanced(by: slice.startIndex)
self.init(start: base, count: slice.count)
}

% end
Expand All @@ -523,9 +523,8 @@ extension Unsafe${Mutable}BufferPointer {
/// - Parameter slice: The buffer slice to rebase.
@inlinable // unsafe-performance
public init(rebasing slice: Slice<UnsafeMutableBufferPointer<Element>>) {
self.init(
start: slice.base.baseAddress! + slice.startIndex,
count: slice.count)
let base = slice.base.baseAddress?.advanced(by: slice.startIndex)
self.init(start: base, count: slice.count)
}

/// Deallocates the memory block previously allocated at this buffer pointer’s
Expand Down
12 changes: 6 additions & 6 deletions stdlib/public/core/UnsafeRawBufferPointer.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ extension Unsafe${Mutable}RawBufferPointer {
/// buffer's type `T` must be a trivial type.
@inlinable
public init<T>(_ buffer: UnsafeMutableBufferPointer<T>) {
self.init(start: buffer.baseAddress!,
self.init(start: buffer.baseAddress,
count: buffer.count * MemoryLayout<T>.stride)
}

Expand All @@ -478,7 +478,7 @@ extension Unsafe${Mutable}RawBufferPointer {
/// buffer's type `T` must be a trivial type.
@inlinable
public init<T>(_ buffer: UnsafeBufferPointer<T>) {
self.init(start: buffer.baseAddress!,
self.init(start: buffer.baseAddress,
count: buffer.count * MemoryLayout<T>.stride)
}
% end # !mutable
Expand Down Expand Up @@ -506,8 +506,8 @@ extension Unsafe${Mutable}RawBufferPointer {
/// - Parameter slice: The raw buffer slice to rebase.
@inlinable
public init(rebasing slice: Slice<UnsafeRawBufferPointer>) {
self.init(start: slice.base.baseAddress! + slice.startIndex,
count: slice.count)
let base = slice.base.baseAddress?.advanced(by: slice.startIndex)
self.init(start: base, count: slice.count)
}
% end # !mutable

Expand All @@ -533,8 +533,8 @@ extension Unsafe${Mutable}RawBufferPointer {
/// - Parameter slice: The raw buffer slice to rebase.
@inlinable
public init(rebasing slice: Slice<UnsafeMutableRawBufferPointer>) {
self.init(start: slice.base.baseAddress! + slice.startIndex,
count: slice.count)
let base = slice.base.baseAddress?.advanced(by: slice.startIndex)
self.init(start: base, count: slice.count)
}

/// A pointer to the first byte of the buffer.
Expand Down
32 changes: 32 additions & 0 deletions test/stdlib/UnsafeRawBufferPointer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,38 @@ UnsafeRawBufferPointerTestSuite.test("initFromValue") {
expectEqual(value2, value1)
}

UnsafeRawBufferPointerTestSuite.test("initFromNilBuffer") {
let urbp1 =
UnsafeRawBufferPointer(UnsafeBufferPointer<Int>(start: nil, count: 0))
expectEqual(urbp1.baseAddress, nil)

let urbp2 =
UnsafeRawBufferPointer(UnsafeMutableBufferPointer<Int>(start: nil, count: 0))
expectEqual(urbp2.baseAddress, nil)

let umrbp =
UnsafeMutableRawBufferPointer(
UnsafeMutableBufferPointer<Int>(start: nil, count: 0))
expectEqual(umrbp.baseAddress, nil)
}

UnsafeRawBufferPointerTestSuite.test("initFromNilSlice") {
let urbp1 =
UnsafeRawBufferPointer(
rebasing: UnsafeRawBufferPointer(start: nil, count: 0)[...])
expectEqual(urbp1.baseAddress, nil)

let urbp2 =
UnsafeRawBufferPointer(
rebasing: UnsafeMutableRawBufferPointer(start: nil, count: 0)[...])
expectEqual(urbp2.baseAddress, nil)

let umrbp =
UnsafeMutableRawBufferPointer(
rebasing: UnsafeMutableRawBufferPointer(start: nil, count: 0)[...])
expectEqual(umrbp.baseAddress, nil)
}

// Test mutability and subscript getter/setters.
UnsafeRawBufferPointerTestSuite.test("nonmutating_subscript_setter") {
var value1: Int32 = -1
Expand Down
13 changes: 13 additions & 0 deletions validation-test/stdlib/UnsafeBufferPointer.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,19 @@ ${SelfName}TestSuite.test("rebasing") {
expectEqual(rebased2[0], slice[i + 1])
}
}

let rebased3 = ${SelfType}(rebasing: ${SelfType}(start: nil, count: 0)[...])
expectEqual(rebased3.baseAddress, nil)

% if not IsMutable:
% if IsRaw:
let rebased4 = ${SelfType}(rebasing: UnsafeMutableRawBufferPointer(start: nil, count: 0)[...])
expectEqual(rebased4.baseAddress, nil)
% else:
let rebased4 = ${SelfType}(rebasing: UnsafeMutableBufferPointer<Float>(start: nil, count: 0)[...])
expectEqual(rebased4.baseAddress, nil)
% end # !Raw
% end # Mutable
}

// Allocate two buffers. Initialize one and copy it into the other. Pass those
Expand Down