tor-commits March 2014

tor-commits@lists.torproject.org

22 participants
2036 discussions

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 6c4fb789044b6e635a7d75445ffcc56e2b084ce9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 20:45:41 2014 +0000 Update translations for tails-misc_completed --- it.po | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 20 deletions(-) diff --git a/it.po b/it.po index 0d08065..6edfa5d 100644 --- a/it.po +++ b/it.po @@ -3,9 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# il_doc <filippo.giomi(a)gmail.com>, 2014 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # jan <jan.reister(a)unimi.it>, 2013 # jan <jan.reister(a)unimi.it>, 2013 +# momocat <momocat19(a)gmail.com>, 2014 # Random_R, 2013 # Random_R, 2013-2014 # Rossano Praderi <dshortway(a)gmail.com>, 2013 @@ -13,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-29 15:05+0100\n" -"PO-Revision-Date: 2014-02-19 09:02+0000\n" -"Last-Translator: il_doc <filippo.giomi(a)gmail.com>\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-31 20:30+0000\n" +"Last-Translator: momocat <momocat19(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +25,11 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor è pronto" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "Ora puoi navigare in internet." @@ -254,21 +256,21 @@ msgstr "Informazioni rilascio:\n%s" msgid "About Tails" msgstr "Info su Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" msgstr "Il tuo software aggiuntivo" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "L'aggiornamento è fallito, potrebbe trattarsi di un problema di rete. Controlla la connessione di rete, prova a riavviare Tails, o leggi il log di sistema per capire meglio il problema." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." msgstr "L'aggiornamento è riuscito." @@ -286,10 +288,45 @@ msgstr "Tor ha bisogno di un orologio accurato per funzionare correttamente, spe msgid "Failed to synchronize the clock!" msgstr "Sincronizzazione orologio fallita!" +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 +msgid "Network connection blocked?" +msgstr "Connessione di rete bloccata?" + +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 +msgid "" +"It looks like you are blocked from the network. This may be related to the " +"MAC spoofing feature. For more information, see the <a " +"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" +" spoofing documentation</a>." +msgstr "Sembra che tu sia bloccato dalla rete. Potrebbe essere dovuto alla modifica del tuo indirizzo MAC. Per ulteriori informazioni, guarda la <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">documentazione relativa al MAC spoofing</a>." + #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" msgstr "Questa versione di Tails ha problemi di sicurezza noti:" +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#, sh-format +msgid "Network card ${nic} disabled" +msgstr "Scheda di rete ${nic} disabilitata" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "Il MAC spoofing è fallito per la carta di rete ${nic_name} (${nic}) che è quindi temporaneamente disabilitata.\nPotresti voler riavviare Tails e disabilitare il MAC spoofing. Guarda qui la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentazione</a>." + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +msgid "All networking disabled" +msgstr "Rete disabilitata" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "Il MAC spoofing è fallito per la carta di rete ${nic_name} (${nic}). Anche la recovery dell'errore è fallita e la navigazione è disabilitata. \nPotresti voler riavviare Tails e disabilitare il MAC spoofing. Guarda qui la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentazione</a>." + #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." msgstr "Avvio di I2P..." @@ -315,6 +352,29 @@ msgid "" "following directory for more information:" msgstr "Qualcosa è andato storto durante l'avvio di I2P. Controlla i log nella seguente cartella per maggiori informazioni:" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "errore:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "Errore" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "Memoria insufficiente per controllare gli aggiornamenti.\n\nAssicurati che il sistema soddisfi i prerequisiti necessari per eseguire Tails.\nControlla in file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProva a riavviare Tails per ricontrollare la presenza di aggiornamenti.\n\nO aggiorna il manuale.\nGuarda https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "Attenzione: macchina virtuale rilevata!" @@ -332,14 +392,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Leggi altro...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "errore:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "Errore" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Vuoi veramente avviare il Browser Non Sicuro?" @@ -416,10 +468,15 @@ msgstr "TrueCrypt presto verrà rimosso da Tails a causa di problemi con la lice msgid "Report an error" msgstr "Segnala un errore" -#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" msgstr "Documentazione di Tails" +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 +msgid "Learn how to use Tails" +msgstr "Impara a usare Tails" + #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " msgstr "Rete overlay anonima"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 8be56a04e24e463a1f60cc4351ffb43cf60c60de Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 20:45:39 2014 +0000 Update translations for tails-misc --- it.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/it.po b/it.po index bc3af34..6edfa5d 100644 --- a/it.po +++ b/it.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-31 20:10+0000\n" +"PO-Revision-Date: 2014-03-31 20:30+0000\n" "Last-Translator: momocat <momocat19(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" @@ -314,7 +314,7 @@ msgstr "Scheda di rete ${nic} disabilitata" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "Il MAC spoofing è fallito per la carta di rete ${nic_name} (${nic}) che è quindi temporaneamente disabilitata.\nPotresti voler riavviare Tails e disabilitare il MAC spoofing. Guarda qui la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentazione</a>." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" @@ -325,7 +325,7 @@ msgstr "Rete disabilitata" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "Il MAC spoofing è fallito per la carta di rete ${nic_name} (${nic}). Anche la recovery dell'errore è fallita e la navigazione è disabilitata. \nPotresti voler riavviare Tails e disabilitare il MAC spoofing. Guarda qui la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentazione</a>." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -373,7 +373,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "Memoria insufficiente per controllare gli aggiornamenti.\n\nAssicurati che il sistema soddisfi i prerequisiti necessari per eseguire Tails.\nControlla in file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProva a riavviare Tails per ricontrollare la presenza di aggiornamenti.\n\nO aggiorna il manuale.\nGuarda https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 04e0c338de085f4830cfa78f426ce53f3aab5288 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 20:45:33 2014 +0000 Update translations for tor-launcher-network-settings --- it/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 54d07c3..2f17932 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Prima di connetterti alla rete Tor, devi fornire le informazioni riguardo la connessione internet di questo computer."> <!ENTITY torSettings.yes "Sì"> <!ENTITY torSettings.no "No"> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?"> <!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni."> <!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -50,7 +50,7 @@ <!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> <!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> <!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)"> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "Tipo indirizzo:porta"> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé">

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 32cc7ea2836a907db1fdc0c6c0c647f111dff7d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 20:15:37 2014 +0000 Update translations for tails-misc --- it.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it.po b/it.po index 2263704..bc3af34 100644 --- a/it.po +++ b/it.po @@ -7,6 +7,7 @@ # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # jan <jan.reister(a)unimi.it>, 2013 # jan <jan.reister(a)unimi.it>, 2013 +# momocat <momocat19(a)gmail.com>, 2014 # Random_R, 2013 # Random_R, 2013-2014 # Rossano Praderi <dshortway(a)gmail.com>, 2013 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 10:00+0000\n" -"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" +"PO-Revision-Date: 2014-03-31 20:10+0000\n" +"Last-Translator: momocat <momocat19(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -297,7 +298,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Sembra che tu sia bloccato dalla rete. Potrebbe essere dovuto alla modifica del tuo indirizzo MAC. Per ulteriori informazioni, guarda la <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">documentazione relativa al MAC spoofing</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:"

1 0

[tor/master] changes file for bug8787
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 3118af2d5fca7999a94d73690d83463ddacf9acb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 11:57:40 2014 -0400 changes file for bug8787 --- changes/bug8787 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug8787 b/changes/bug8787 new file mode 100644 index 0000000..212844a --- /dev/null +++ b/changes/bug8787 @@ -0,0 +1,5 @@ + o Minor features: + - Always check return values for unlink, munmap, UnmapViewOfFile; + check strftime return values more often. In some cases all we + can do is report a warning, but this may help prevent deeper + bugs from going unnoticed. Closes ticket 8787.

1 0

[tor/master] Merge branch 'bug8787_squashed'
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit c0441cca8b483882f5676b98081f0fe4b52d3ae1 Merge: 4ebad0d 3118af2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 11:57:56 2014 -0400 Merge branch 'bug8787_squashed' changes/bug8787 | 5 +++ src/common/compat.c | 85 ++++++++++++++++++++++++++++++++++++++++-------- src/common/compat.h | 2 +- src/common/tortls.c | 17 +++++++--- src/common/util.c | 9 ++++- src/or/config.c | 5 ++- src/or/hibernate.c | 10 +++++- src/or/main.c | 17 +++++++--- src/or/microdesc.c | 21 +++++++++--- src/or/networkstatus.c | 21 +++++++++--- src/or/routerlist.c | 34 ++++++++++++++----- src/or/statefile.c | 10 ++++-- src/test/test_util.c | 11 +++---- 13 files changed, 197 insertions(+), 50 deletions(-)

1 0

[tor/master] Check return values for tor_munmap_file() in unit tests
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 8e94d5f22ee863d57a76233cd75099d522bd38c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 11:40:00 2014 -0400 Check return values for tor_munmap_file() in unit tests --- src/test/test_util.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 9104088..a471b8e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1577,14 +1577,14 @@ test_util_mmap(void) test_eq(mapping->size, strlen("Short file.")); test_streq(mapping->data, "Short file."); #ifdef _WIN32 - tor_munmap_file(mapping); + tt_int_op(0, ==, tor_munmap_file(mapping)); mapping = NULL; test_assert(unlink(fname1) == 0); #else /* make sure we can unlink. */ test_assert(unlink(fname1) == 0); test_streq(mapping->data, "Short file."); - tor_munmap_file(mapping); + tt_int_op(0, ==, tor_munmap_file(mapping)); mapping = NULL; #endif @@ -1605,7 +1605,7 @@ test_util_mmap(void) test_assert(mapping); test_eq(mapping->size, buflen); test_memeq(mapping->data, buf, buflen); - tor_munmap_file(mapping); + tt_int_op(0, ==, tor_munmap_file(mapping)); mapping = NULL; /* Now try a big aligned file. */ @@ -1614,7 +1614,7 @@ test_util_mmap(void) test_assert(mapping); test_eq(mapping->size, 16384); test_memeq(mapping->data, buf, 16384); - tor_munmap_file(mapping); + tt_int_op(0, ==, tor_munmap_file(mapping)); mapping = NULL; done: @@ -1627,8 +1627,7 @@ test_util_mmap(void) tor_free(fname3); tor_free(buf); - if (mapping) - tor_munmap_file(mapping); + tor_munmap_file(mapping); } /** Run unit tests for escaping/unescaping data for use by controllers. */

1 0

[tor/master] NULL out all mappings after tor_munmap_file()
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 449b87791d5a9f15c63b39e0ff36f8ba89676c6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 11:42:49 2014 -0400 NULL out all mappings after tor_munmap_file() --- src/or/microdesc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index f196536..9c91f17 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -509,6 +509,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) log_warn(LD_FS, "Failed to unmap old microdescriptor cache while rebuilding"); } + cache->cache_content = NULL; } if (finish_writing_to_file(open_file) < 0) {

1 0

[tor/master] Munmap the right pointers in routerlist_free()
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 1a9b4bd28cf22e28d2c1b7b24a092d85c7c61139 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 11:43:11 2014 -0400 Munmap the right pointers in routerlist_free() --- src/or/routerlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c96fb2c..44c6987 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2804,13 +2804,13 @@ routerlist_free(routerlist_t *rl) signed_descriptor_free(sd)); smartlist_free(rl->routers); smartlist_free(rl->old_routers); - if (routerlist->desc_store.mmap) { + if (rl->desc_store.mmap) { int res = tor_munmap_file(routerlist->desc_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap"); } } - if (routerlist->extrainfo_store.mmap) { + if (rl->extrainfo_store.mmap) { int res = tor_munmap_file(routerlist->extrainfo_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap");

1 0

[tor/master] Add return value and assert for null parameter to tor_munmap_file()
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 389251eda902d16f3066bac6e8e5c0f596e3428f Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 18 10:47:17 2014 -0700 Add return value and assert for null parameter to tor_munmap_file() --- src/common/compat.c | 54 ++++++++++++++++++++++++++++++++++++++++++--------- src/common/compat.h | 2 +- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 8e2619f..b43af88 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -227,12 +227,27 @@ tor_mmap_file(const char *filename) return res; } -/** Release storage held for a memory mapping. */ -void +/** Release storage held for a memory mapping; returns 0 on success, + * or -1 on failure (and logs a warning). */ +int tor_munmap_file(tor_mmap_t *handle) { - munmap((char*)handle->data, handle->mapping_size); - tor_free(handle); + int res; + + if (handle == NULL) + return 0; + + res = munmap((char*)handle->data, handle->mapping_size); + if (res == 0) { + /* munmap() succeeded */ + tor_free(handle); + } else { + log_warn(LD_FS, "Failed to munmap() in tor_munmap_file(): %s", + strerror(errno)); + res = -1; + } + + return res; } #elif defined(_WIN32) tor_mmap_t * @@ -314,17 +329,27 @@ tor_mmap_file(const char *filename) tor_munmap_file(res); return NULL; } -void + +/* Unmap the file, and return 0 for success or -1 for failure */ +int tor_munmap_file(tor_mmap_t *handle) { - if (handle->data) + tor_assert(handle != NULL); + if (handle->data) { /* This is an ugly cast, but without it, "data" in struct tor_mmap_t would have to be redefined as non-const. */ - UnmapViewOfFile( (LPVOID) handle->data); + BOOL ok = UnmapViewOfFile( (LPVOID) handle->data); + if (!ok) { + log_warn(LD_FS, "Failed to UnmapViewOfFile() in tor_munmap_file(): %d", + (int)GetLastError()); + } + } if (handle->mmap_handle != NULL) CloseHandle(handle->mmap_handle); tor_free(handle); + + return 0; } #else tor_mmap_t * @@ -340,13 +365,24 @@ tor_mmap_file(const char *filename) handle->size = st.st_size; return handle; } -void + +/** Unmap the file mapped with tor_mmap_file(), and return 0 for success + * or -1 for failure. + */ + +int tor_munmap_file(tor_mmap_t *handle) { - char *d = (char*)handle->data; + char *d = NULL; + + tor_assert(handle != NULL); + d = (char*)handle->data; tor_free(d); memwipe(handle, 0, sizeof(tor_mmap_t)); tor_free(handle); + + /* Can't fail in this mmap()/munmap()-free case */ + return 0; } #endif diff --git a/src/common/compat.h b/src/common/compat.h index 32effa5..c464464 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -292,7 +292,7 @@ typedef struct tor_mmap_t { } tor_mmap_t; tor_mmap_t *tor_mmap_file(const char *filename) ATTR_NONNULL((1)); -void tor_munmap_file(tor_mmap_t *handle) ATTR_NONNULL((1)); +int tor_munmap_file(tor_mmap_t *handle) ATTR_NONNULL((1)); int tor_snprintf(char *str, size_t size, const char *format, ...) CHECK_PRINTF(3,4) ATTR_NONNULL((1,3));

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2014