Skip to content

Fix warning "initialization of '...' results in a dangling pointer" #2640

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.

Sign up for GitHub

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 3, 2020
Merged

Fix warning "initialization of '...' results in a dangling pointer" #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Foundation/NSData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,22 +207,22 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
/// Initializes a data object with the given Base64 encoded string.
public init?(base64Encoded base64String: String, options: Base64DecodingOptions = []) {
let encodedBytes = Array(base64String.utf8)
guard let decodedBytes = NSData.base64DecodeBytes(encodedBytes, options: options) else {
guard var decodedBytes = NSData.base64DecodeBytes(encodedBytes, options: options) else {
return nil
}
super.init()
_init(bytes: UnsafeMutableRawPointer(mutating: decodedBytes), length: decodedBytes.count, copy: true)
_init(bytes: &decodedBytes, length: decodedBytes.count, copy: true)
}

/// Initializes a data object with the given Base64 encoded data.
public init?(base64Encoded base64Data: Data, options: Base64DecodingOptions = []) {
var encodedBytes = [UInt8](repeating: 0, count: base64Data.count)
base64Data._nsObject.getBytes(&encodedBytes, length: encodedBytes.count)
guard let decodedBytes = NSData.base64DecodeBytes(encodedBytes, options: options) else {
guard var decodedBytes = NSData.base64DecodeBytes(encodedBytes, options: options) else {
return nil
}
super.init()
_init(bytes: UnsafeMutableRawPointer(mutating: decodedBytes), length: decodedBytes.count, copy: true)
_init(bytes: &decodedBytes, length: decodedBytes.count, copy: true)
}

deinit {
Expand Down
10 changes: 5 additions & 5 deletions TestFoundation/TestJSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,11 +1415,11 @@ extension TestJSONSerialization {
}
}

func test_jsonObjectToOutputStreamBuffer(){
func test_jsonObjectToOutputStreamBuffer() {
let dict = ["a":["b":1]]
do {
let buffer = Array<UInt8>(repeating: 0, count: 20)
let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: 20)
var buffer = Array<UInt8>(repeating: 0, count: 20)
let outputStream = OutputStream(toBuffer: &buffer, capacity: buffer.count)
outputStream.open()
let result = try JSONSerialization.writeJSONObject(dict, toStream: outputStream, options: [])
outputStream.close()
Expand Down Expand Up @@ -1463,8 +1463,8 @@ extension TestJSONSerialization {
func test_jsonObjectToOutputStreamInsufficientBuffer() {
#if !DARWIN_COMPATIBILITY_TESTS // Hangs
let dict = ["a":["b":1]]
let buffer = Array<UInt8>(repeating: 0, count: 10)
let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: buffer.count)
var buffer = Array<UInt8>(repeating: 0, count: 10)
let outputStream = OutputStream(toBuffer: &buffer, capacity: buffer.count)
outputStream.open()
do {
let result = try JSONSerialization.writeJSONObject(dict, toStream: outputStream, options: [])
Expand Down
10 changes: 6 additions & 4 deletions TestFoundation/TestNSKeyedArchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,16 @@ class TestNSKeyedArchiver : XCTestCase {

func test_archive_charptr() {
let charArray = [CChar]("Hello world, we are testing!\0".utf8CString)
var charPtr = UnsafeMutablePointer(mutating: charArray)

test_archive({ archiver -> Bool in
charArray.withUnsafeBufferPointer { (buffer: UnsafeBufferPointer<CChar>) in
var charPtr = buffer.baseAddress!
test_archive({ archiver -> Bool in
let value = NSValue(bytes: &charPtr, objCType: "*")

archiver.encode(value, forKey: "root")
return true
},
decode: {unarchiver -> Bool in
decode: {unarchiver -> Bool in
guard let value = unarchiver.decodeObject(of: NSValue.self, forKey: "root") else {
return false
}
Expand All @@ -299,7 +300,8 @@ class TestNSKeyedArchiver : XCTestCase {

return s1 == s2
}
})
})
}
}

func test_archive_user_class() {
Expand Down
12 changes: 7 additions & 5 deletions TestFoundation/TestNSValue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,14 @@ class TestNSValue : XCTestCase {
}

func test_valueWithCharPtr() {
let charArray = [UInt8]("testing123".utf8)
var charPtr = UnsafeMutablePointer(mutating: charArray)
var expectedPtr: UnsafeMutablePointer<UInt8>? = nil
var charArray = [UInt8]("testing123".utf8)
charArray.withUnsafeMutableBufferPointer {
var charPtr = $0.baseAddress!
var expectedPtr: UnsafeMutablePointer<UInt8>? = nil

NSValue(bytes: &charPtr, objCType: "*").getValue(&expectedPtr)
XCTAssertEqual(charPtr, expectedPtr)
NSValue(bytes: &charPtr, objCType: "*").getValue(&expectedPtr)
XCTAssertEqual(charPtr, expectedPtr)
}
}

func test_isEqual() {
Expand Down
12 changes: 6 additions & 6 deletions TestFoundation/TestStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class TestStream : XCTestCase {
var buffer = Array<UInt8>(repeating: 0, count: 12)
let myString = "Hello world!"
let encodedData = [UInt8](myString.utf8)
let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: 12)
let outputStream = OutputStream(toBuffer: &buffer, capacity: buffer.count)
XCTAssertEqual(.notOpen, outputStream.streamStatus)
outputStream.open()
XCTAssertEqual(.open, outputStream.streamStatus)
Expand Down Expand Up @@ -238,19 +238,19 @@ class TestStream : XCTestCase {
//verify the data written
let dataWritten = outputStream.property(forKey: Stream.PropertyKey.dataWrittenToMemoryStreamKey)
if let nsdataWritten = dataWritten as? NSData {
nsdataWritten.getBytes(UnsafeMutablePointer(mutating: buffer), length: result!)
XCTAssertEqual(NSString(bytes: &buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue), NSString(string: myString))
nsdataWritten.getBytes(&buffer, length: result!)
XCTAssertEqual(NSString(bytes: buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue), NSString(string: myString))
outputStream.close()
} else {
XCTFail("Unable to get data from memeory.")
XCTFail("Unable to get data from memory.")
}
}

func test_outputStreamHasSpaceAvailable() {
let buffer = Array<UInt8>(repeating: 0, count: 12)
var buffer = Array<UInt8>(repeating: 0, count: 12)
let myString = "Welcome To Hello world !"
let encodedData = [UInt8](myString.utf8)
let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: 12)
let outputStream = OutputStream(toBuffer: &buffer, capacity: buffer.count)
outputStream.open()
XCTAssertTrue(outputStream.hasSpaceAvailable)
_ = outputStream.write(encodedData, maxLength: encodedData.count)
Expand Down