October 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug27893'
by nickm＠torproject.org 01 Oct '18

01 Oct '18

commit 43211c3a0c4b56d4100daf3a541250b953fb7230 Merge: 58299b292 8812f562a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 12:12:33 2018 -0500 Merge remote-tracking branch 'public/bug27893' changes/bug27893 | 3 +++ src/app/config/config.c | 9 +++++++++ src/app/config/confparse.c | 5 +++-- src/app/config/confparse.h | 4 ++++ src/app/config/statefile.c | 9 +++++++++ src/feature/dirauth/shared_random_state.c | 8 ++++++++ 6 files changed, 36 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix a memory leak in --dump-config
by nickm＠torproject.org 01 Oct '18

01 Oct '18

commit 8812f562a03234723871b893f269db09e78654fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 27 13:05:19 2018 -0400 Fix a memory leak in --dump-config When freeing a configuration object from confparse.c in dump_config(), we need to call the appropriate higher-level free function (like or_options_free()) and not just config_free(). This only happens with options (since they're the one where options_validate allocates extra stuff) and only when running --dump-config with something other than minimal (since OPTIONS_DUMP_MINIMAL doesn't hit this code). Fixes bug 27893; bugfix on 0.3.2.1-alpha. --- changes/bug27893 | 3 +++ src/app/config/config.c | 9 +++++++++ src/app/config/confparse.c | 5 +++-- src/app/config/confparse.h | 4 ++++ src/app/config/statefile.c | 9 +++++++++ src/feature/dirauth/shared_random_state.c | 8 ++++++++ 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/changes/bug27893 b/changes/bug27893 new file mode 100644 index 000000000..98b0f558c --- /dev/null +++ b/changes/bug27893 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a small memory leak when calling Tor with --dump-config. + Fixes bug 27893; bugfix on 0.3.2.1-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 91e275865..b8cb50340 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -824,6 +824,7 @@ static void config_maybe_load_geoip_files_(const or_options_t *options, static int options_validate_cb(void *old_options, void *options, void *default_options, int from_setconf, char **msg); +static void options_free_cb(void *options); static void cleanup_protocol_warning_severity_level(void); static void set_protocol_warning_severity_level(int warning_severity); @@ -839,6 +840,7 @@ STATIC config_format_t options_format = { option_deprecation_notes_, option_vars_, options_validate_cb, + options_free_cb, NULL }; @@ -3149,6 +3151,13 @@ options_validate_cb(void *old_options, void *options, void *default_options, return rv; } +/** Callback to free an or_options_t */ +static void +options_free_cb(void *options) +{ + or_options_free_(options); +} + #define REJECT(arg) \ STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END #if defined(__GNUC__) && __GNUC__ <= 3 diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 045cbc94f..35897935f 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -1009,8 +1009,9 @@ config_dump(const config_format_t *fmt, const void *default_options, result = smartlist_join_strings(elements, "", 0, NULL); SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); - if (defaults_tmp) - config_free(fmt, defaults_tmp); + if (defaults_tmp) { + fmt->free_fn(defaults_tmp); + } return result; } diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index aebd035c5..efaa3e480 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -155,6 +155,9 @@ typedef struct config_var_t { * of arguments. */ typedef int (*validate_fn_t)(void*,void*,void*,int,char**); +/** Callback to free a configuration object. */ +typedef void (*free_cfg_fn_t)(void*); + /** Information on the keys, value types, key-to-struct-member mappings, * variable descriptions, validation functions, and abbreviations for a * configuration or storage format. */ @@ -169,6 +172,7 @@ typedef struct config_format_t { config_var_t *vars; /**< List of variables we recognize, their default * values, and where we stick them in the structure. */ validate_fn_t validate_fn; /**< Function to validate config. */ + free_cfg_fn_t free_fn; /**< Function to free the configuration. */ /** If present, extra is a LINELIST variable for unrecognized * lines. Otherwise, unrecognized lines are an error. */ config_var_t *extra; diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 510b8964b..8a8b7ced0 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -143,6 +143,8 @@ static int or_state_validate_cb(void *old_options, void *options, void *default_options, int from_setconf, char **msg); +static void or_state_free_cb(void *state); + /** Magic value for or_state_t. */ #define OR_STATE_MAGIC 0x57A73f57 @@ -162,6 +164,7 @@ static const config_format_t state_format = { NULL, state_vars_, or_state_validate_cb, + or_state_free_cb, &state_extra_var, }; @@ -259,6 +262,12 @@ or_state_validate_cb(void *old_state, void *state, void *default_state, return or_state_validate(state, msg); } +static void +or_state_free_cb(void *state) +{ + or_state_free_(state); +} + /** Return 0 if every setting in <b>state</b> is reasonable, and a * permissible transition from <b>old_state</b>. Else warn and return -1. * Should have no side effects, except for normalizing the contents of diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 55936a736..38c7fd76d 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -63,6 +63,7 @@ DUMMY_TYPECHECK_INSTANCE(sr_disk_state_t); static int disk_state_validate_cb(void *old_state, void *state, void *default_state, int from_setconf, char **msg); +static void disk_state_free_cb(void *); /* Array of variables that are saved to disk as a persistent state. */ static config_var_t state_vars[] = { @@ -96,6 +97,7 @@ static const config_format_t state_format = { NULL, state_vars, disk_state_validate_cb, + disk_state_free_cb, &state_extra_var, }; @@ -342,6 +344,12 @@ disk_state_validate_cb(void *old_state, void *state, void *default_state, return 0; } +static void +disk_state_free_cb(void *state) +{ + disk_state_free_(state); +} + /* Parse the Commit line(s) in the disk state and translate them to the * the memory state. Return 0 on success else -1 on error. */ static int

1 0

[tor/master] Merge remote-tracking branch 'public/bug27728'
by nickm＠torproject.org 01 Oct '18

01 Oct '18

commit 58299b2927ffe4c7db7ddb6b3d44d1567c8a341f Merge: c4e29001c ea5792f33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 12:06:39 2018 -0500 Merge remote-tracking branch 'public/bug27728' changes/bug27728 | 7 +++++++ src/lib/crypt_ops/crypto_rand.c | 12 +++++++++++- src/lib/crypt_ops/crypto_rand.h | 3 ++- src/test/test_hs_descriptor.c | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-)

1 0

[tor/master] Make crypto_strongest_rand() non-mockable
by nickm＠torproject.org 01 Oct '18

01 Oct '18

commit ea5792f333b1b92306d20e60b5e12bb0633aa740 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 12:40:18 2018 -0400 Make crypto_strongest_rand() non-mockable Instead, have it call a mockable function. We don't want crypto_strongest_rand() to be mockable, since doing so creates a type error when we call it from ed25519-donna, which we do not build in a test mode. Fixes bug 27728; bugfix on 0.3.5.1-alpha --- changes/bug27728 | 7 +++++++ src/lib/crypt_ops/crypto_rand.c | 12 +++++++++++- src/lib/crypt_ops/crypto_rand.h | 3 ++- src/test/test_hs_descriptor.c | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug27728 b/changes/bug27728 new file mode 100644 index 000000000..f0b3e6dc0 --- /dev/null +++ b/changes/bug27728 @@ -0,0 +1,7 @@ + o Minor bugfixes (compilation): + - Compile the ed25519-donna code with a correct declaration of + crypto_strongest_rand(). Previously, we build it with one type, + but link it against another in the unit tests, which caused + compilation failures with LTO enabled, and which could have + caused other undefined behavior in the tests. Fixes bug 27728; + bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 313d829a5..cffd0610f 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -335,8 +335,18 @@ crypto_strongest_rand_raw(uint8_t *out, size_t out_len) * Try to get <b>out_len</b> bytes of the strongest entropy we can generate, * storing it into <b>out</b>. **/ +void +crypto_strongest_rand(uint8_t *out, size_t out_len) +{ + crypto_strongest_rand_(out, out_len); +} + +/** + * Try to get <b>out_len</b> bytes of the strongest entropy we can generate, + * storing it into <b>out</b>. (Mockable version.) + **/ MOCK_IMPL(void, -crypto_strongest_rand,(uint8_t *out, size_t out_len)) +crypto_strongest_rand_,(uint8_t *out, size_t out_len)) { #define DLEN DIGEST512_LEN diff --git a/src/lib/crypt_ops/crypto_rand.h b/src/lib/crypt_ops/crypto_rand.h index 25bcfa1f1..0c538d81a 100644 --- a/src/lib/crypt_ops/crypto_rand.h +++ b/src/lib/crypt_ops/crypto_rand.h @@ -21,7 +21,8 @@ int crypto_seed_rng(void) ATTR_WUR; MOCK_DECL(void,crypto_rand,(char *to, size_t n)); void crypto_rand_unmocked(char *to, size_t n); -MOCK_DECL(void,crypto_strongest_rand,(uint8_t *out, size_t out_len)); +void crypto_strongest_rand(uint8_t *out, size_t out_len); +MOCK_DECL(void,crypto_strongest_rand_,(uint8_t *out, size_t out_len)); int crypto_rand_int(unsigned int max); int crypto_rand_int_range(unsigned int min, unsigned int max); uint64_t crypto_rand_uint64_range(uint64_t min, uint64_t max); diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 90f2be290..428ca1024 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -909,7 +909,7 @@ test_build_authorized_client(void *arg) client_pubkey_b16, strlen(client_pubkey_b16)); - MOCK(crypto_strongest_rand, mock_crypto_strongest_rand); + MOCK(crypto_strongest_rand_, mock_crypto_strongest_rand); hs_desc_build_authorized_client(subcredential, &client_auth_pk, &auth_ephemeral_sk, @@ -925,7 +925,7 @@ test_build_authorized_client(void *arg) done: tor_free(desc_client); tor_free(mem_op_hex_tmp); - UNMOCK(crypto_strongest_rand); + UNMOCK(crypto_strongest_rand_); } struct testcase_t hs_descriptor[] = {

1 0

[tor/master] Fix a bug where we would crash on --version.
by nickm＠torproject.org 01 Oct '18

01 Oct '18

commit c4e29001c48f33ea8b0035da65da50ddf15ffa71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 12:01:46 2018 -0500 Fix a bug where we would crash on --version. Bug not in any released Tor. test-stem would have caught this. --- src/feature/stats/predict_ports.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/feature/stats/predict_ports.c b/src/feature/stats/predict_ports.c index 8abf34f50..ebf4a4246 100644 --- a/src/feature/stats/predict_ports.c +++ b/src/feature/stats/predict_ports.c @@ -303,6 +303,8 @@ predicted_ports_init(void) void predicted_ports_free_all(void) { + if (!predicted_ports_list) + return; predicted_ports_total_alloc -= smartlist_len(predicted_ports_list)*sizeof(predicted_port_t); SMARTLIST_FOREACH(predicted_ports_list, predicted_port_t *,

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 01 Oct '18

01 Oct '18

commit f32837625ddb6a7f44e695b8b7a9496a235cef5f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 13:15:58 2018 +0000 Update translations for tails-misc_completed --- el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 53d0f2ca1..21c00daa6 100644 --- a/el.po +++ b/el.po @@ -21,14 +21,15 @@ # kotkotkot <kotakota(a)gmail.com>, 2013 # LOUKAS SKOUROLIAKOS, 2015 # metamec, 2015 +# Sofia K., 2018 # TitanJack <titanjack.com(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-09-27 09:22+0000\n" -"Last-Translator: A Papac <ap909219(a)protonmail.com>\n" +"PO-Revision-Date: 2018-10-01 13:09+0000\n" +"Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +60,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Βοηθήστε μας να διορθώσουμε το σφάλμα!</h1>\n<p>Διαβάστε <a href=\"%s\">τις οδηγίες μας σχετικά με την αναφορά σφάλματος</a>.</p>\n<p><strong>Μην συμπεριλαμβάνετε περισσότερες προσωπικές πληροφορίες από ότι\nχρειάζεται!</strong></p>\n<h2>Σχετικά με τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας</h2>\n<p>\nΔίνοντάς μας μια διεύθυνση ηλεκτρονικού ταχυδρομείου μας επιτρέπετε να επικοινωνήσουμε μαζί σας για διασαφήνιση του προβλήματος. Αυτό \nχρειάζεται για τη συντριπτική πλειοψηφία των αναφορών που λαμβάνουμε καθώς οι περισσότερες αναφορές \nείναι άχρηστες χωρίς κάπ οια πληροφορία για επικοινωνία. Από την άλλη πλευρά, αυτό δίνει ευκαιρία \nσε ωτακουστές, όπως τον πάροχο e-mail σας ή τον πάροχο Internet, να \nεπιβεβαιώσουν ότι χρησιμοποιείτε Tails. \n</p>\n" +msgstr "<h1>Βοηθήστε μας να διορθώσουμε το σφάλμα!</h1>\n<p>Διαβάστε <a href=\"%s\">τις οδηγίες μας σχετικά με την αναφορά σφάλματος</a>.</p>\n<p><strong>Μην συμπεριλαμβάνετε περισσότερες προσωπικές πληροφορίες από ότι\nχρειάζεται!</strong></p>\n<h2>Σχετικά με τη διεύθυνση email σας</h2>\n<p>\nΔίνοντάς μας μια διεύθυνση email μας επιτρέπετε να επικοινωνήσουμε μαζί σας για διασαφήνιση του προβλήματος. Αυτό \nχρειάζεται για τη συντριπτική πλειοψηφία των αναφορών που λαμβάνουμε καθώς οι περισσότερες αναφορές \nείναι άχρηστες χωρίς κάποια πληροφορία για επικοινωνία. Από την άλλη πλε υρά, αυτό δίνει ευκαιρία \nσε ωτακουστές, όπως τον πάροχο e-mail σας ή τον πάροχο Internet, να \nεπιβεβαιώσουν ότι χρησιμοποιείτε Tails. \n</p>\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 01 Oct '18

01 Oct '18

commit 593f1adaa547a8a6214052706bc0a27a40f143a1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 1 13:15:53 2018 +0000 Update translations for tails-misc --- el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 53d0f2ca1..21c00daa6 100644 --- a/el.po +++ b/el.po @@ -21,14 +21,15 @@ # kotkotkot <kotakota(a)gmail.com>, 2013 # LOUKAS SKOUROLIAKOS, 2015 # metamec, 2015 +# Sofia K., 2018 # TitanJack <titanjack.com(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-09-27 09:22+0000\n" -"Last-Translator: A Papac <ap909219(a)protonmail.com>\n" +"PO-Revision-Date: 2018-10-01 13:09+0000\n" +"Last-Translator: Sofia K.\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +60,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Βοηθήστε μας να διορθώσουμε το σφάλμα!</h1>\n<p>Διαβάστε <a href=\"%s\">τις οδηγίες μας σχετικά με την αναφορά σφάλματος</a>.</p>\n<p><strong>Μην συμπεριλαμβάνετε περισσότερες προσωπικές πληροφορίες από ότι\nχρειάζεται!</strong></p>\n<h2>Σχετικά με τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας</h2>\n<p>\nΔίνοντάς μας μια διεύθυνση ηλεκτρονικού ταχυδρομείου μας επιτρέπετε να επικοινωνήσουμε μαζί σας για διασαφήνιση του προβλήματος. Αυτό \nχρειάζεται για τη συντριπτική πλειοψηφία των αναφορών που λαμβάνουμε καθώς οι περισσότερες αναφορές \nείναι άχρηστες χωρίς κάπ οια πληροφορία για επικοινωνία. Από την άλλη πλευρά, αυτό δίνει ευκαιρία \nσε ωτακουστές, όπως τον πάροχο e-mail σας ή τον πάροχο Internet, να \nεπιβεβαιώσουν ότι χρησιμοποιείτε Tails. \n</p>\n" +msgstr "<h1>Βοηθήστε μας να διορθώσουμε το σφάλμα!</h1>\n<p>Διαβάστε <a href=\"%s\">τις οδηγίες μας σχετικά με την αναφορά σφάλματος</a>.</p>\n<p><strong>Μην συμπεριλαμβάνετε περισσότερες προσωπικές πληροφορίες από ότι\nχρειάζεται!</strong></p>\n<h2>Σχετικά με τη διεύθυνση email σας</h2>\n<p>\nΔίνοντάς μας μια διεύθυνση email μας επιτρέπετε να επικοινωνήσουμε μαζί σας για διασαφήνιση του προβλήματος. Αυτό \nχρειάζεται για τη συντριπτική πλειοψηφία των αναφορών που λαμβάνουμε καθώς οι περισσότερες αναφορές \nείναι άχρηστες χωρίς κάποια πληροφορία για επικοινωνία. Από την άλλη πλε υρά, αυτό δίνει ευκαιρία \nσε ωτακουστές, όπως τον πάροχο e-mail σας ή τον πάροχο Internet, να \nεπιβεβαιώσουν ότι χρησιμοποιείτε Tails. \n</p>\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 msgid ""

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.2
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 477884d77cfa213307db56c2cb60eee8575865d4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 1 13:05:57 2018 +0000 Release preparations for 8.0.2 Version bumps and Changelog update --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d675eb..debff32 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.0 + firefox_platform_version: 60.2.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0c7d943..ec0bf46 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 8.0.2 -- October 2 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.0.1 -- September 24 2018 * All platforms * Update Tor to 0.3.4.8 diff --git a/rbm.conf b/rbm.conf index 9f10ba5..fbc9776 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.1' - torbrowser_build: 'build3' + torbrowser_version: '8.0.2' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0 + - 8.0.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 3943f44464ab5aa6bf92b3326cd99479779a83c7 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit f3a77068c18589f124c8ad4697476b11b4fada6a Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0