-
Notifications
You must be signed in to change notification settings - Fork 100
Fix crash in ChannelAvatarsMerger when accessing shared properties #858
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.
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
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3482782
Fix crash in ChannelAvatarsMerger when accessing shared properties
laevandus 598935f
Add unit-test for concurrent access
laevandus a08d4cd
Merge branch 'develop' into fix/channel-avatars-merger-crash
laevandus 3fd04d5
Update CHANGELOG.md
laevandus bd974f8
Move changelog entry
laevandus b08ae1b
Merge branch 'fix/channel-avatars-merger-crash' of https://github.com…
laevandus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
StreamChatSwiftUITests/Tests/ChatChannelList/ChannelAvatarsMerger_Tests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // | ||
| // Copyright © 2025 Stream.io Inc. All rights reserved. | ||
| // | ||
|
|
||
| @testable import StreamChatSwiftUI | ||
| @testable import StreamChatTestTools | ||
| import XCTest | ||
|
|
||
| final class ChannelAvatarsMergerTests: StreamChatTestCase { | ||
| private var merger: ChannelAvatarsMerger! | ||
|
|
||
| override func setUp() { | ||
| super.setUp() | ||
| merger = ChannelAvatarsMerger() | ||
| } | ||
|
|
||
| override func tearDown() { | ||
| super.tearDown() | ||
| merger = nil | ||
| } | ||
|
|
||
| func testConcurrentCalls() { | ||
| let sourceImages: [UIImage] = [ | ||
| XCTestCase.TestImages.chewbacca.image, | ||
| XCTestCase.TestImages.r2.image, | ||
| XCTestCase.TestImages.vader.image, | ||
| XCTestCase.TestImages.yoda.image | ||
| ] | ||
| DispatchQueue.concurrentPerform(iterations: 100) { _ in | ||
| let images = Array(sourceImages.prefix((1...4).randomElement()!)) | ||
| let mergedImage = merger.createMergedAvatar(from: images) | ||
| XCTAssertNotNil(mergedImage) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to replicate the crash with unit tests? We have a couple of unit tests that cover this type of scenario, where we access objects from multiple threads, and ensure it does not crash. Can we add a test for this as well, to avoid future potential regressions? 🙏
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Added