Skip to content

Protect against overflows in BoxedFlagValues #109

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

Draft
huwr wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Protect against overflows in BoxedFlagValues #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0127110
Protect against overflows in BoxedFlagValues
huwr Mar 17, 2023
dbfb6dd
Fix SwiftLint
huwr Mar 17, 2023
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
36 changes: 18 additions & 18 deletions Sources/Vexil/Value.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ extension Int8: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = Int8(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(Int8.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -221,8 +221,8 @@ extension Int16: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = Int16(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(Int16.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -234,8 +234,8 @@ extension Int32: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = Int32(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(Int32.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -247,8 +247,8 @@ extension Int64: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = Int64(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(Int64.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -260,8 +260,8 @@ extension UInt: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = UInt(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(UInt.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -273,8 +273,8 @@ extension UInt8: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = UInt8(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(UInt8.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -286,8 +286,8 @@ extension UInt16: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = UInt16(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(UInt16.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -299,8 +299,8 @@ extension UInt32: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = UInt32(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(UInt32.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand All @@ -312,8 +312,8 @@ extension UInt64: FlagValue {
public typealias BoxedValueType = Int

public init? (boxedFlagValue: BoxedFlagValue) {
guard let value = Int(boxedFlagValue: boxedFlagValue) else { return nil }
self = UInt64(value)
guard let value = Int(boxedFlagValue: boxedFlagValue).flatMap(UInt64.init(exactly:)) else { return nil }
self = value
}

public var boxedFlagValue: BoxedFlagValue {
Expand Down
39 changes: 39 additions & 0 deletions Tests/VexilTests/FlagValueUnboxingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,45 @@ final class FlagValueUnboxingTests: XCTestCase {
}


// MARK: - Integer overflows

func testInt8FlagValueWithOverflow () {
let boxed = BoxedFlagValue.integer(Int(Int8.max) + 1)

XCTAssertNil(Int8(boxedFlagValue: boxed))
}

func testInt16FlagValueWithOverflow () {
let boxed = BoxedFlagValue.integer(Int(Int16.max) + 1)

XCTAssertNil(Int16(boxedFlagValue: boxed))
}

func testInt32FlagValueWithOverflow () {
let boxed = BoxedFlagValue.integer(Int(Int32.max) + 1)

XCTAssertNil(Int32(boxedFlagValue: boxed))
}

func testUInt8FlagValueWithOverflow () {
let boxed = BoxedFlagValue.integer(Int(UInt8.max) + 1)

XCTAssertNil(UInt8(boxedFlagValue: boxed))
}

func testUInt16FlagValueWithOverflow () {
let boxed = BoxedFlagValue.integer(Int(UInt16.max) + 1)

XCTAssertNil(UInt16(boxedFlagValue: boxed))
}

func testUInt32FlagValueWithOverflow () {
let boxed = BoxedFlagValue.integer(Int(UInt32.max) + 1)

XCTAssertNil(UInt32(boxedFlagValue: boxed))
}


// MARK: - Floating Point Flag Values

func testFloatFlagValue () {
Expand Down