Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: util/mach/exc_server_variants.cc

Issue 649713002: Use the correct null constants for Mach threads, tasks, and hosts (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « util/mach/exc_client_variants_test.cc ('k') | util/mach/exc_server_variants_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 const exception_data_type_t* code, 508 const exception_data_type_t* code,
509 mach_msg_type_number_t code_count, 509 mach_msg_type_number_t code_count,
510 thread_state_flavor_t* flavor, 510 thread_state_flavor_t* flavor,
511 const natural_t* old_state, 511 const natural_t* old_state,
512 mach_msg_type_number_t old_state_count, 512 mach_msg_type_number_t old_state_count,
513 thread_state_t new_state, 513 thread_state_t new_state,
514 mach_msg_type_number_t* new_state_count) { 514 mach_msg_type_number_t* new_state_count) {
515 bool destroy_complex_request = false; 515 bool destroy_complex_request = false;
516 return interface_->CatchException(EXCEPTION_STATE, 516 return interface_->CatchException(EXCEPTION_STATE,
517 exception_port, 517 exception_port,
518 MACH_PORT_NULL, 518 THREAD_NULL,
519 MACH_PORT_NULL, 519 TASK_NULL,
520 exception, 520 exception,
521 code, 521 code,
522 code_count, 522 code_count,
523 flavor, 523 flavor,
524 old_state, 524 old_state,
525 old_state_count, 525 old_state_count,
526 new_state, 526 new_state,
527 new_state_count, 527 new_state_count,
528 &destroy_complex_request); 528 &destroy_complex_request);
529 } 529 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 const mach_exception_data_type_t* code, 595 const mach_exception_data_type_t* code,
596 mach_msg_type_number_t code_count, 596 mach_msg_type_number_t code_count,
597 thread_state_flavor_t* flavor, 597 thread_state_flavor_t* flavor,
598 const natural_t* old_state, 598 const natural_t* old_state,
599 mach_msg_type_number_t old_state_count, 599 mach_msg_type_number_t old_state_count,
600 thread_state_t new_state, 600 thread_state_t new_state,
601 mach_msg_type_number_t* new_state_count) { 601 mach_msg_type_number_t* new_state_count) {
602 bool destroy_complex_request = false; 602 bool destroy_complex_request = false;
603 return interface_->CatchMachException(EXCEPTION_STATE | MACH_EXCEPTION_CODES, 603 return interface_->CatchMachException(EXCEPTION_STATE | MACH_EXCEPTION_CODES,
604 exception_port, 604 exception_port,
605 MACH_PORT_NULL, 605 THREAD_NULL,
606 MACH_PORT_NULL, 606 TASK_NULL,
607 exception, 607 exception,
608 code, 608 code,
609 code_count, 609 code_count,
610 flavor, 610 flavor,
611 old_state, 611 old_state,
612 old_state_count, 612 old_state_count,
613 new_state, 613 new_state,
614 new_state_count, 614 new_state_count,
615 &destroy_complex_request); 615 &destroy_complex_request);
616 } 616 }
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 kern_return_t ExcServerSuccessfulReturnValue(exception_behavior_t behavior, 753 kern_return_t ExcServerSuccessfulReturnValue(exception_behavior_t behavior,
754 bool set_thread_state) { 754 bool set_thread_state) {
755 if (!set_thread_state && ExceptionBehaviorHasState(behavior)) { 755 if (!set_thread_state && ExceptionBehaviorHasState(behavior)) {
756 return MACH_RCV_PORT_DIED; 756 return MACH_RCV_PORT_DIED;
757 } 757 }
758 758
759 return KERN_SUCCESS; 759 return KERN_SUCCESS;
760 } 760 }
761 761
762 } // namespace crashpad 762 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/mach/exc_client_variants_test.cc ('k') | util/mach/exc_server_variants_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698