Skip to content

Guard against nil reply in createReplyForComment callback #25964

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

Open
jkmassel wants to merge 2 commits into from
+8 −3
Open

Guard against nil reply in createReplyForComment callback #25964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47c5e45
Guard against nil reply in createReplyForComment callback
jkmassel Sep 1, 2026
e5d2397
Log the nil reply case in createReply
jkmassel Sep 1, 2026
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
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/CommentService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extern NSUInteger const WPTopLevelHierarchicalCommentsPerPage;
- (instancetype)init NS_UNAVAILABLE;

// Create reply
- (void)createReplyForComment:(Comment *)comment content:(NSString *)content completion:(void (^)(Comment *reply))completion;
- (void)createReplyForComment:(Comment *)comment content:(NSString *)content completion:(void (^)(Comment * _Nullable reply))completion;

// Sync comments
- (void)syncCommentsForBlog:(Blog *)blog
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/CommentService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ - (Comment *)createCommentForBlog:(Blog *)blog
}

// Create reply
- (void)createReplyForComment:(Comment *)comment content:(NSString *)content completion:(void (^)(Comment *reply))completion
- (void)createReplyForComment:(Comment *)comment content:(NSString *)content completion:(void (^)(Comment * _Nullable reply))completion
{
NSManagedObjectID *parentCommentID = comment.objectID;
NSManagedObjectID * __block replyID = nil;
Expand Down
7 changes: 6 additions & 1 deletion WordPress/Classes/ViewRelated/Comments/Controllers/CommentDetailViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,8 +1011,13 @@ private extension CommentDetailViewController {
return
}

try await withUnsafeThrowingContinuation { continuation in
try await withUnsafeThrowingContinuation { (continuation: UnsafeContinuation<Void, Error>) in
commentService.createReply(for: comment, content: content) { reply in
guard let reply else {
DDLogError("Failed creating comment reply: reply was nil after save")
continuation.resume(throwing: URLError(.unknown))
return
}
self.commentService.uploadComment(reply, success: { [weak self] in
self?.refreshCommentReplyIfNeeded()
continuation.resume()
Expand Down