Skip to content

Fix build errors and a crash in xcode 15 #2093

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 2 commits into from
Sep 11, 2023
Merged

Fix build errors and a crash in xcode 15 #2093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c16662
Fix build errors and a crash in xcode 15
cacmartinez Sep 7, 2023
8277d7e
early return if 0 or negative dimensions found
cacmartinez Sep 8, 2023
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
8 changes: 4 additions & 4 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- iOSSnapshotTestCase/Core (6.2.0)
- OCMock (3.6)
- OCMock (3.9.1)

DEPENDENCIES:
- iOSSnapshotTestCase/Core (~> 6.2)
Expand All @@ -13,8 +13,8 @@ SPEC REPOS:

SPEC CHECKSUMS:
iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8

PODFILE CHECKSUM: 1b4ea0e8ab7d94a46b1964a2354686c2e599c8c2
PODFILE CHECKSUM: 0a3b63450c1b52ec105545b62c41089097e077d6

COCOAPODS: 1.10.0
COCOAPODS: 1.12.1
4 changes: 3 additions & 1 deletion Source/Details/ASGraphicsContext.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ NS_INLINE void ASConfigureExtendedRange(UIGraphicsImageRendererFormat *format)
}

// Bad OS or experiment flag. Use UIGraphics* API.
UIGraphicsBeginImageContextWithOptions(size, opaque, scale);
if (size.width > 0 && size.height > 0) {
UIGraphicsBeginImageContextWithOptions(size, opaque, scale);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have an invalid size, I think we should exit early and return nil. Shortly after starting the image context we call UIGraphicsGetImageFromCurrentImageContext and UIGraphicsEndImageContext. I'm not sure what the behavior is if we end a graphics context without starting one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've switched to an early return

}
ASPerformBlockWithTraitCollection(work, traitCollection)
UIImage *image = nil;
if (isCancelled == nil || !isCancelled()) {
Expand Down
2 changes: 1 addition & 1 deletion Source/Details/ASThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
#import <AsyncDisplayKit/ASRecursiveUnfairLock.h>

ASDISPLAYNODE_INLINE AS_WARN_UNUSED_RESULT BOOL ASDisplayNodeThreadIsMain()
ASDISPLAYNODE_INLINE AS_WARN_UNUSED_RESULT BOOL ASDisplayNodeThreadIsMain(void)
{
return 0 != pthread_main_np();
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Layout/ASDimensionInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ typedef struct {
/**
* Returns an ASLayoutElementSize with default values.
*/
ASDISPLAYNODE_INLINE AS_WARN_UNUSED_RESULT ASLayoutElementSize ASLayoutElementSizeMake()
ASDISPLAYNODE_INLINE AS_WARN_UNUSED_RESULT ASLayoutElementSize ASLayoutElementSizeMake(void)
{
return (ASLayoutElementSize){
.width = ASDimensionAuto,
Expand Down