macos: Fix more than one element in array crashes application I don't know how I got to that iteration code, but the `UnsafePointer<T>.successor` is NOT a method to iterate over an array. <https://codeberg.org/pocka/plac/issues/17>

Changes

2 changed files (+31/-48)

• macos/plac/Core/Discovery.swift
  • @@ -76,24 +76,14 @@
    var entries: [CoreServer] = [] if ptr.pointee.code == PlacKit.PLAC_DISCOVERY_SCAN_RESULT_OK { - if ptr.pointee.servers_len == 0 { - logger.info("Server not found") - self.entries = [] - return - } - - let current = ptr.pointee.servers_ptr?.pointee - guard var current = current else { - logger.warning("servers_ptr is null") - self.entries = [] - return - } - - for _ in 0..<ptr.pointee.servers_len { + for i in 0..<ptr.pointee.servers_len { entries.append( - CoreServer(ptr: PlacKit.plac_discovery_server_retain(current)) + CoreServer( + ptr: PlacKit.plac_discovery_server_retain( + ptr.pointee.servers_ptr[i] + ) + ) ) - current = current.successor() } }
• macos/plac/Core/Transport.swift
  • @@ -75,56 +75,49 @@ self.addedZones = []
    if ptr.pointee.added_zones_len > 0 { var addedZones: [CoreZone] = [] - if var current = ptr.pointee.added_zones_ptr.pointee { - for _ in 0..<ptr.pointee.added_zones_len { - addedZones.append( - CoreZone(ptr: PlacKit.plac_transport_zone_retain(current)) + for i in 0..<ptr.pointee.added_zones_len { + addedZones.append( + CoreZone( + ptr: PlacKit.plac_transport_zone_retain( + ptr.pointee.added_zones_ptr[i] + ) ) - current = current.successor() - } + ) + } - self.addedZones = addedZones - } else { - logger.warning("added_zones_ptr is null") - } + self.addedZones = addedZones } self.changedZones = [] if ptr.pointee.changed_zones_len > 0 { var changedZones: [CoreZone] = [] - if var current = ptr.pointee.changed_zones_ptr.pointee { - for _ in 0..<ptr.pointee.changed_zones_len { - changedZones.append( - CoreZone(ptr: PlacKit.plac_transport_zone_retain(current)) + for i in 0..<ptr.pointee.changed_zones_len { + changedZones.append( + CoreZone( + ptr: PlacKit.plac_transport_zone_retain( + ptr.pointee.changed_zones_ptr[i] + ) ) - current = current.successor() - } - - self.changedZones = changedZones - } else { - logger.warning("changed_zones_ptr is null") + ) } + + self.changedZones = changedZones } self.removedZoneIds = [] if ptr.pointee.removed_zone_ids_len > 0 { var removedZoneIds: [String] = [] - if var current = ptr.pointee.removed_zone_ids_ptr { - for i in 0..<ptr.pointee.removed_zone_ids_len { - if let strPtr = current.pointee { - removedZoneIds.append(String(cString: strPtr)) - } else { - logger.warning("removed_zone_ids_ptr[\(i)] is null pointer") - } - current = current.successor() + for i in 0..<ptr.pointee.removed_zone_ids_len { + if let strPtr = ptr.pointee.removed_zone_ids_ptr[i] { + removedZoneIds.append(String(cString: strPtr)) + } else { + logger.warning("removed_zone_ids_ptr[\(i)] is null pointer") } + } - self.removedZoneIds = removedZoneIds - } else { - logger.warning("removed_zone_ids_ptr is null") - } + self.removedZoneIds = removedZoneIds } }