toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch@129ffea94266 (annotated)
toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # User Julian Seward <jseward@acm.org> |
| michael@0 | 3 | # Date 1365953823 -7200 |
| michael@0 | 4 | # Node ID 21d2964d1337c0fce7375025610298a818ddbd0f |
| michael@0 | 5 | # Parent ef802a6418f25841880359e6dab3e8240bfd0821 |
| michael@0 | 6 | Bug 861141 - Connect Breakpad on Android to faulty.lib's mmap interface. r=ted. |
| michael@0 | 7 | Adds a prototype for ReadSymbolDataInternal so it can be called from |
| michael@0 | 8 | outside breakpad. |
| michael@0 | 9 | |
| michael@0 | 10 | diff --git src/common/linux/dump_symbols.h |
| michael@0 | 11 | --- a/src/common/linux/dump_symbols.h |
| michael@0 | 12 | +++ b/src/common/linux/dump_symbols.h |
| michael@0 | 13 | @@ -36,16 +36,17 @@ |
| michael@0 | 14 | #define COMMON_LINUX_DUMP_SYMBOLS_H__ |
| michael@0 | 15 | |
| michael@0 | 16 | #include <iostream> |
| michael@0 | 17 | #include <string> |
| michael@0 | 18 | #include <vector> |
| michael@0 | 19 | |
| michael@0 | 20 | #include "common/symbol_data.h" |
| michael@0 | 21 | #include "common/using_std_string.h" |
| michael@0 | 22 | +#include "google_breakpad/common/breakpad_types.h" |
| michael@0 | 23 | |
| michael@0 | 24 | namespace google_breakpad { |
| michael@0 | 25 | |
| michael@0 | 26 | class Module; |
| michael@0 | 27 | |
| michael@0 | 28 | // Find all the debugging information in OBJ_FILE, an ELF executable |
| michael@0 | 29 | // or shared library, and write it to SYM_STREAM in the Breakpad symbol |
| michael@0 | 30 | // file format. |
| michael@0 | 31 | @@ -60,11 +61,19 @@ bool WriteSymbolFile(const string &obj_f |
| michael@0 | 32 | // As above, but simply return the debugging information in MODULE |
| michael@0 | 33 | // instead of writing it to a stream. The caller owns the resulting |
| michael@0 | 34 | // Module object and must delete it when finished. |
| michael@0 | 35 | bool ReadSymbolData(const string& obj_file, |
| michael@0 | 36 | const std::vector<string>& debug_dirs, |
| michael@0 | 37 | SymbolData symbol_data, |
| michael@0 | 38 | Module** module); |
| michael@0 | 39 | |
| michael@0 | 40 | +// Same as ReadSymbolData, except don't try to open the file; instead |
| michael@0 | 41 | +// just use the in-memory data (mapped image of it) located at OBJ_FILE. |
| michael@0 | 42 | +bool ReadSymbolDataInternal(const uint8_t* obj_file, |
| michael@0 | 43 | + const string& obj_filename, |
| michael@0 | 44 | + const std::vector<string>& debug_dirs, |
| michael@0 | 45 | + SymbolData symbol_data, |
| michael@0 | 46 | + Module** module); |
| michael@0 | 47 | + |
| michael@0 | 48 | } // namespace google_breakpad |
| michael@0 | 49 | |
| michael@0 | 50 | #endif // COMMON_LINUX_DUMP_SYMBOLS_H__ |
