Skip to content

Don't prevent passing NULL to non-Objective-C pointer parameters. #225

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
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't prevent passing NULL to non-Objective-C pointer parameters. #225

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
13 changes: 10 additions & 3 deletions Service/Sources/EDOInvocationMessage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,16 @@ + (instancetype)requestWithInvocation:(NSInvocation *)invocation
value = objRef ? BOX_VALUE(*objRef, target, service, nil)
: [EDOBoxedValueType parameterForDoublePointerNullValue];
} else if (EDO_IS_POINTER(ctype)) {
// TODO(haowoo): Add the proper error and/or exception handler.
NSAssert(NO, @"Not supported type (%s) in the argument for selector (%@).", ctype,
selector ? NSStringFromSelector(selector) : @"(block)");
void *objRef;
[invocation getArgument:&objRef atIndex:i];

// Don't assert if the pointer is NULL.
if (objRef != NULL) {
// TODO(haowoo): Add the proper error and/or exception handler.
NSAssert(NO, @"Not supported type (%s) in argument %@ for selector (%@).", ctype, @(i),
selector ? NSStringFromSelector(selector) : @"(block)");
}
value = [EDOBoxedValueType parameterForNilValue];
} else {
NSUInteger typeSize = 0L;
NSGetSizeAndAlignment(ctype, &typeSize, NULL);
Expand Down