OLD | NEW |
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 return nullptr; | 44 return nullptr; |
45 } | 45 } |
46 | 46 |
47 CFPropertyListRef value_cf = | 47 CFPropertyListRef value_cf = |
48 implicit_cast<CFPropertyListRef>([dictionary_ns objectForKey:key]); | 48 implicit_cast<CFPropertyListRef>([dictionary_ns objectForKey:key]); |
49 launch_data_t value_launch = CFPropertyToLaunchData(value_cf); | 49 launch_data_t value_launch = CFPropertyToLaunchData(value_cf); |
50 if (!value_launch) { | 50 if (!value_launch) { |
51 return nullptr; | 51 return nullptr; |
52 } | 52 } |
53 | 53 |
54 LaunchDataDictInsert(dictionary_launch, value_launch, [key UTF8String]); | 54 LaunchDataDictInsert( |
| 55 dictionary_launch.get(), value_launch, [key UTF8String]); |
55 } | 56 } |
56 | 57 |
57 data_launch = dictionary_launch.release(); | 58 data_launch = dictionary_launch.release(); |
58 | 59 |
59 } else if (type_id_cf == CFArrayGetTypeID()) { | 60 } else if (type_id_cf == CFArrayGetTypeID()) { |
60 NSArray* array_ns = base::mac::CFToNSCast( | 61 NSArray* array_ns = base::mac::CFToNSCast( |
61 base::mac::CFCastStrict<CFArrayRef>(property_cf)); | 62 base::mac::CFCastStrict<CFArrayRef>(property_cf)); |
62 base::mac::ScopedLaunchData array_launch( | 63 base::mac::ScopedLaunchData array_launch( |
63 LaunchDataAlloc(LAUNCH_DATA_ARRAY)); | 64 LaunchDataAlloc(LAUNCH_DATA_ARRAY)); |
64 size_t index = 0; | 65 size_t index = 0; |
65 | 66 |
66 for (id element_ns in array_ns) { | 67 for (id element_ns in array_ns) { |
67 CFPropertyListRef element_cf = | 68 CFPropertyListRef element_cf = |
68 implicit_cast<CFPropertyListRef>(element_ns); | 69 implicit_cast<CFPropertyListRef>(element_ns); |
69 launch_data_t element_launch = CFPropertyToLaunchData(element_cf); | 70 launch_data_t element_launch = CFPropertyToLaunchData(element_cf); |
70 if (!element_launch) { | 71 if (!element_launch) { |
71 return nullptr; | 72 return nullptr; |
72 } | 73 } |
73 | 74 |
74 LaunchDataArraySetIndex(array_launch, element_launch, index++); | 75 LaunchDataArraySetIndex(array_launch.get(), element_launch, index++); |
75 } | 76 } |
76 | 77 |
77 data_launch = array_launch.release(); | 78 data_launch = array_launch.release(); |
78 | 79 |
79 } else if (type_id_cf == CFNumberGetTypeID()) { | 80 } else if (type_id_cf == CFNumberGetTypeID()) { |
80 CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf); | 81 CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf); |
81 NSNumber* number_ns = base::mac::CFToNSCast(number_cf); | 82 NSNumber* number_ns = base::mac::CFToNSCast(number_cf); |
82 switch (CFNumberGetType(number_cf)) { | 83 switch (CFNumberGetType(number_cf)) { |
83 case kCFNumberSInt8Type: | 84 case kCFNumberSInt8Type: |
84 case kCFNumberSInt16Type: | 85 case kCFNumberSInt16Type: |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 CFCopyTypeIDDescription(type_id_cf)); | 133 CFCopyTypeIDDescription(type_id_cf)); |
133 DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" | 134 DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" |
134 << base::SysCFStringRefToUTF8(type_name_cf) << ")"; | 135 << base::SysCFStringRefToUTF8(type_name_cf) << ")"; |
135 } | 136 } |
136 | 137 |
137 return data_launch; | 138 return data_launch; |
138 } | 139 } |
139 } | 140 } |
140 | 141 |
141 } // namespace crashpad | 142 } // namespace crashpad |
OLD | NEW |