Skip to content

CBOR: Use Data.startIndex to ensure correct offset for slices #90

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
kdubb merged 1 commit into from
Jun 16, 2025
Merged

CBOR: Use Data.startIndex to ensure correct offset for slices #90

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
5 changes: 3 additions & 2 deletions Sources/PotentCBOR/CBORStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,16 @@ public class CBORDataStream: CBORInputStream, CBOROutputStream {

public init(data: Data = Data(), offset: Int = 0) {
self.data = data
self.offset = offset
self.offset = offset + data.startIndex
}

public func reset() {
data.removeAll()
offset = data.startIndex
}

func checkAvailable(count: Int) throws {
if (offset + count) > data.count {
if (offset + count) > data.endIndex {
throw CBORSerialization.Error.unexpectedEndOfStream
}
}
Expand Down
6 changes: 6 additions & 0 deletions Tests/CBORDecoderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ import XCTest

class CBORDecoderTests: XCTestCase {

func testDecodeFromSlice() {
let data = Data([0x1, 0x2, 0x3, 0x64, 0x49, 0x45, 0x54, 0x46, 0x3, 0x2, 0x1])
let slice = data[3..<data.count-3]
XCTAssertEqual(try CBORDecoder.default.decode(String.self, from: slice), "IETF")
}

func testDecodeEmpty() {
struct Empty: Equatable, Codable {}
XCTAssertEqual(try CBORDecoder.default.decode(Empty.self, from: Data([0xA0])), Empty())
Expand Down
Loading