Skip to content
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

Jump to bottom

Remove ExceptionHandler::ForwardAndReply() #4

Closed
wants to merge 1 commit into from
Closed

Remove ExceptionHandler::ForwardAndReply() #4

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
87 changes: 0 additions & 87 deletions src/client/mac/handler/exception_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,91 +952,4 @@ bool ExceptionHandler::ResumeThreads() {

return true;
}

bool ExceptionHandler::ForwardAndReply( mach_msg_header_t* InHeadP,
mach_msg_header_t* OutHeadP) {
OutHeadP->msgh_bits =
MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(InHeadP->msgh_bits), 0);
OutHeadP->msgh_remote_port = InHeadP->msgh_remote_port;
/* Minimal size: routine() will update it if different */
OutHeadP->msgh_size = (mach_msg_size_t)sizeof(mig_reply_error_t);
OutHeadP->msgh_local_port = MACH_PORT_NULL;
OutHeadP->msgh_id = InHeadP->msgh_id + 100;

if (InHeadP->msgh_id != 2401) {
((mig_reply_error_t*)OutHeadP)->NDR = NDR_record;
((mig_reply_error_t*)OutHeadP)->RetCode = MIG_BAD_ID;
return false;
}

#ifdef __MigPackStructs
#pragma pack(4)
#endif
typedef struct {
mach_msg_header_t Head;
/* start of the kernel processed data */
mach_msg_body_t msgh_body;
mach_msg_port_descriptor_t thread;
mach_msg_port_descriptor_t task;
/* end of the kernel processed data */
NDR_record_t NDR;
exception_type_t exception;
mach_msg_type_number_t codeCnt;
integer_t code[2];
mach_msg_trailer_t trailer;
} Request;

typedef struct {
mach_msg_header_t Head;
NDR_record_t NDR;
kern_return_t RetCode;
} Reply;
#ifdef __MigPackStructs
#pragma pack()
#endif

Request* In0P = (Request*)InHeadP;
Reply* OutP = (Reply*)OutHeadP;

if (In0P->task.name != mach_task_self()) {
return false;
}

auto* prev = this->previous_;

unsigned int found;
for (found = 0; found < prev->count; ++found) {
if (prev->masks[found] & (1 << In0P->exception)) {
break;
}
}

// Nothing to forward
if (found == prev->count) {
fprintf(stderr, "** No previous ports for forwarding!! \n");
return false;
}

mach_port_t target_port = prev->ports[found];
exception_behavior_t target_behavior = prev->behaviors[found];

kern_return_t result;
// TODO: Handle the case where |target_behavior| has MACH_EXCEPTION_CODES
// set. https://bugs.chromium.org/p/google-breakpad/issues/detail?id=551
switch (target_behavior) {
case EXCEPTION_DEFAULT:
fprintf(stderr, "FORWARDING EXCEPTION!! \n");
result = exception_raise(target_port, In0P->thread.name, In0P->task.name, In0P->exception,
In0P->code, In0P->codeCnt);
break;
default:
fprintf(stderr, "** Unknown exception behavior: %d\n", target_behavior);
result = exception_raise(target_port, In0P->thread.name, In0P->task.name, In0P->exception,
In0P->code, In0P->codeCnt);
break;
}

OutP->RetCode = result;
OutP->NDR = NDR_record;
}
} // namespace google_breakpad
2 changes: 0 additions & 2 deletions src/client/mac/handler/exception_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ class ExceptionHandler {
// success, false otherwise.
bool SendMessageToHandlerThread(HandlerThreadMessage message_id);

bool ForwardAndReply( mach_msg_header_t* InHeadP, mach_msg_header_t* OutHeadP);

// All minidump writing goes through this one routine.
// |task_context| can be NULL. If not, it will be used to retrieve the
// context of the current thread, instead of using |thread_get_state|.
Expand Down