Skip to content

Fixing crashes when using overflowing values #246

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
Jun 11, 2021
Merged

Fixing crashes when using overflowing values #246

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
10 changes: 5 additions & 5 deletions LaunchDarkly/LaunchDarkly/Models/DiagnosticEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,20 @@ struct DiagnosticConfig: Codable {
customEventsURI = config.eventsUrl != LDConfig.Defaults.eventsUrl
customStreamURI = config.streamUrl != LDConfig.Defaults.streamUrl
eventsCapacity = config.eventCapacity
connectTimeoutMillis = Int(round(config.connectionTimeout * 1_000))
eventsFlushIntervalMillis = Int(round(config.eventFlushInterval * 1_000))
connectTimeoutMillis = Int(exactly: round(config.connectionTimeout * 1_000)) ?? .max
eventsFlushIntervalMillis = Int(exactly: round(config.eventFlushInterval * 1_000)) ?? .max
streamingDisabled = config.streamingMode == .polling
allAttributesPrivate = config.allUserAttributesPrivate
pollingIntervalMillis = Int(round(config.flagPollingInterval * 1_000))
backgroundPollingIntervalMillis = Int(round(config.backgroundFlagPollingInterval * 1_000))
pollingIntervalMillis = Int(exactly: round(config.flagPollingInterval * 1_000)) ?? .max
backgroundPollingIntervalMillis = Int(exactly: round(config.backgroundFlagPollingInterval * 1_000)) ?? .max
inlineUsersInEvents = config.inlineUserInEvents
useReport = config.useReport
backgroundPollingDisabled = !config.enableBackgroundUpdates
evaluationReasonsRequested = config.evaluationReasons
// While the SDK treats all negative values as unlimited, for consistency we only send -1 for diagnostics
maxCachedUsers = config.maxCachedUsers >= 0 ? config.maxCachedUsers : -1
mobileKeyCount = 1 + (config.getSecondaryMobileKeys().count)
diagnosticRecordingIntervalMillis = Int(round(config.diagnosticRecordingInterval * 1_000))
diagnosticRecordingIntervalMillis = Int(exactly: round(config.diagnosticRecordingInterval * 1_000)) ?? .max
customHeaders = !config.additionalHeaders.isEmpty || config.headerDelegate != nil
}
}
16 changes: 16 additions & 0 deletions LaunchDarkly/LaunchDarklyTests/Models/DiagnosticEventSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,22 @@ final class DiagnosticEventSpec: QuickSpec {
expect(diagnosticConfig.customHeaders) == false
}
}
context("init with overflowing config values") {
it("has expected values") {
var overflowingConfig = customConfig
overflowingConfig.backgroundFlagPollingInterval = .greatestFiniteMagnitude
overflowingConfig.connectionTimeout = .greatestFiniteMagnitude
overflowingConfig.diagnosticRecordingInterval = .greatestFiniteMagnitude
overflowingConfig.eventFlushInterval = .greatestFiniteMagnitude
overflowingConfig.flagPollingInterval = .greatestFiniteMagnitude
let diagnosticConfig = DiagnosticConfig(config: overflowingConfig)
expect(diagnosticConfig.backgroundPollingIntervalMillis) == Int.max
expect(diagnosticConfig.connectTimeoutMillis) == Int.max
expect(diagnosticConfig.diagnosticRecordingIntervalMillis) == Int.max
expect(diagnosticConfig.eventsFlushIntervalMillis) == Int.max
expect(diagnosticConfig.pollingIntervalMillis) == Int.max
}
}
var diagnosticConfig: DiagnosticConfig!
for (name, config) in [("default", defaultConfig), ("custom", customConfig)] {
context("with \(name) config") {
Expand Down