BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 18:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds readable size to asserts in read functions (#6210)

Browse Source
This commit is contained in:
mustiikhalil
2020-10-25 15:59:30 +03:00
committed by GitHub
parent e68e8d7de9
commit 42d7c79977
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
swift/Sources/FlatBuffers/ByteBuffer.swift
View File

@@ -293,7 +293,7 @@ public struct ByteBuffer {
/// - def: Type of the object /// - def: Type of the object
/// - position: the index of the object in the buffer /// - position: the index of the object in the buffer
public func read<T>(def: T.Type, position: Int) -> T { public func read<T>(def: T.Type, position: Int) -> T {
assert(position < _storage.capacity, "Reading out of bounds is illegal") assert(position + MemoryLayout<T>.size <= _storage.capacity, "Reading out of bounds is illegal")
return _storage.memory.advanced(by: position).load(as: T.self) return _storage.memory.advanced(by: position).load(as: T.self)
} }
@@ -304,9 +304,10 @@ public struct ByteBuffer {
public func readSlice<T>(index: Int32, public func readSlice<T>(index: Int32,
count: Int32) -> [T] { count: Int32) -> [T] {
let _index = Int(index) let _index = Int(index)
assert(_index < _storage.capacity, "Reading out of bounds is illegal") let _count = Int(count)
assert(_index + _count <= _storage.capacity, "Reading out of bounds is illegal")
let start = _storage.memory.advanced(by: _index).assumingMemoryBound(to: T.self) let start = _storage.memory.advanced(by: _index).assumingMemoryBound(to: T.self)
let array = UnsafeBufferPointer(start: start, count: Int(count)) let array = UnsafeBufferPointer(start: start, count: _count)
return Array(array) return Array(array)
} }
@@ -319,9 +320,10 @@ public struct ByteBuffer {
count: Int32, count: Int32,
type: String.Encoding = .utf8) -> String? { type: String.Encoding = .utf8) -> String? {
let _index = Int(index) let _index = Int(index)
assert(_index < _storage.capacity, "Reading out of bounds is illegal") let _count = Int(count)
assert(_index + _count <= _storage.capacity, "Reading out of bounds is illegal")
let start = _storage.memory.advanced(by: _index).assumingMemoryBound(to: UInt8.self) let start = _storage.memory.advanced(by: _index).assumingMemoryBound(to: UInt8.self)
let bufprt = UnsafeBufferPointer(start: start, count: Int(count)) let bufprt = UnsafeBufferPointer(start: start, count: _count)
return String(bytes: Array(bufprt), encoding: type) return String(bytes: Array(bufprt), encoding: type)
} }