OLD | NEW |
1 // Copyright (c) 2006, Google Inc. | 1 // Copyright (c) 2006, Google Inc. |
2 // All rights reserved. | 2 // All rights reserved. |
3 // | 3 // |
4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
6 // met: | 6 // met: |
7 // | 7 // |
8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 } else if (!data) { | 160 } else if (!data) { |
161 data = CFDataCreateMutable(NULL, 0); | 161 data = CFDataCreateMutable(NULL, 0); |
162 } | 162 } |
163 CFDataAppendBytes(data, data_bytes, num_bytes_read); | 163 CFDataAppendBytes(data, data_bytes, num_bytes_read); |
164 } | 164 } |
165 CFReadStreamClose(read_stream); | 165 CFReadStreamClose(read_stream); |
166 CFRelease(read_stream); | 166 CFRelease(read_stream); |
167 if (!data) { | 167 if (!data) { |
168 return; | 168 return; |
169 } | 169 } |
170 CFDictionaryRef list = static_cast<CFDictionaryRef> | 170 CFDictionaryRef list = |
171 (CFPropertyListCreateFromXMLData(NULL, data, kCFPropertyListImmutable, | 171 static_cast<CFDictionaryRef>(CFPropertyListCreateWithData( |
172 NULL)); | 172 NULL, data, kCFPropertyListImmutable, NULL, NULL)); |
173 CFRelease(data); | 173 CFRelease(data); |
174 if (!list) { | 174 if (!list) { |
175 return; | 175 return; |
176 } | 176 } |
177 CFStringRef build_version = static_cast<CFStringRef> | 177 CFStringRef build_version = static_cast<CFStringRef> |
178 (CFDictionaryGetValue(list, CFSTR("ProductBuildVersion"))); | 178 (CFDictionaryGetValue(list, CFSTR("ProductBuildVersion"))); |
179 CFStringRef product_version = static_cast<CFStringRef> | 179 CFStringRef product_version = static_cast<CFStringRef> |
180 (CFDictionaryGetValue(list, CFSTR("ProductVersion"))); | 180 (CFDictionaryGetValue(list, CFSTR("ProductVersion"))); |
181 string build_str = ConvertToString(build_version); | 181 string build_str = ConvertToString(build_version); |
182 string product_str = ConvertToString(product_version); | 182 string product_str = ConvertToString(product_version); |
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1595 } else { | 1595 } else { |
1596 info_ptr->validity = MD_BREAKPAD_INFO_VALID_DUMP_THREAD_ID; | 1596 info_ptr->validity = MD_BREAKPAD_INFO_VALID_DUMP_THREAD_ID; |
1597 info_ptr->dump_thread_id = handler_thread_; | 1597 info_ptr->dump_thread_id = handler_thread_; |
1598 info_ptr->requesting_thread_id = 0; | 1598 info_ptr->requesting_thread_id = 0; |
1599 } | 1599 } |
1600 | 1600 |
1601 return true; | 1601 return true; |
1602 } | 1602 } |
1603 | 1603 |
1604 } // namespace google_breakpad | 1604 } // namespace google_breakpad |
OLD | NEW |