From owner-freebsd-gecko@FreeBSD.ORG Fri Feb 27 13:23:51 2015 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9EA3F34E for ; Fri, 27 Feb 2015 13:23:51 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43D3CB78 for ; Fri, 27 Feb 2015 13:23:50 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id t1RDNfYT022416 for ; Fri, 27 Feb 2015 13:23:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id t1RDNaSQ021132 for freebsd-gecko@freebsd.org; Fri, 27 Feb 2015 13:23:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 27 Feb 2015 13:23:36 GMT Message-Id: <201502271323.t1RDNaSQ021132@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1819 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Feb 2015 13:23:51 -0000 Author: jbeich Date: Fri Feb 27 13:23:36 2015 New Revision: 1819 Log: Check if NS_NewNativeLocalFile() succeeds before using Obtained from: PkgSrc Modified: trunk/mail/thunderbird/files/patch-bug991253 trunk/www/firefox-esr/files/patch-bug991253 trunk/www/firefox-nightly/files/patch-bug991253 trunk/www/firefox/files/patch-bug991253 trunk/www/libxul/files/patch-bug991253 trunk/www/seamonkey/files/patch-bug991253 Modified: trunk/mail/thunderbird/files/patch-bug991253 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug991253 Mon Feb 23 22:44:53 2015 (r1818) +++ trunk/mail/thunderbird/files/patch-bug991253 Fri Feb 27 13:23:36 2015 (r1819) @@ -1,14 +1,16 @@ --- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs; Modified: trunk/www/firefox-esr/files/patch-bug991253 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug991253 Mon Feb 23 22:44:53 2015 (r1818) +++ trunk/www/firefox-esr/files/patch-bug991253 Fri Feb 27 13:23:36 2015 (r1819) @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs; Modified: trunk/www/firefox-nightly/files/patch-bug991253 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug991253 Mon Feb 23 22:44:53 2015 (r1818) +++ trunk/www/firefox-nightly/files/patch-bug991253 Fri Feb 27 13:23:36 2015 (r1819) @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs; Modified: trunk/www/firefox/files/patch-bug991253 ============================================================================== --- trunk/www/firefox/files/patch-bug991253 Mon Feb 23 22:44:53 2015 (r1818) +++ trunk/www/firefox/files/patch-bug991253 Fri Feb 27 13:23:36 2015 (r1819) @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs; Modified: trunk/www/libxul/files/patch-bug991253 ============================================================================== --- trunk/www/libxul/files/patch-bug991253 Mon Feb 23 22:44:53 2015 (r1818) +++ trunk/www/libxul/files/patch-bug991253 Fri Feb 27 13:23:36 2015 (r1819) @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs; Modified: trunk/www/seamonkey/files/patch-bug991253 ============================================================================== --- trunk/www/seamonkey/files/patch-bug991253 Mon Feb 23 22:44:53 2015 (r1818) +++ trunk/www/seamonkey/files/patch-bug991253 Fri Feb 27 13:23:36 2015 (r1819) @@ -1,14 +1,16 @@ --- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr dictDirs;