forked from pool/MozillaFirefox
a7f369b4c2
* MFSA 2012-34/CVE-2012-1938/CVE-2012-1937/CVE-2011-3101
Miscellaneous memory safety hazards
* MFSA 2012-36/CVE-2012-1944 (bmo#751422)
Content Security Policy inline-script bypass
* MFSA 2012-37/CVE-2012-1945 (bmo#670514)
Information disclosure though Windows file shares and shortcut
files
* MFSA 2012-38/CVE-2012-1946 (bmo#750109)
Use-after-free while replacing/inserting a node in a document
* MFSA 2012-40/CVE-2012-1947/CVE-2012-1940/CVE-2012-1941
Buffer overflow and use-after-free issues found using Address
Sanitizer
- require NSS 3.13.4
* MFSA 2012-39/CVE-2012-0441 (bmo#715073)
- fix sound notifications when filename/path contains a whitespace
(bmo#749739)
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=280
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
|
|
# HG changeset patch
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
# Date 1336632642 -7200
|
|
# Node ID 56cc5a3c431612fa98f0550f02a9f34b566e1d9b
|
|
# Parent 307671d73258761245d165e43591d885c7f68b73
|
|
Bug 749739 - New email sound notification file cannot contain spaces (Linux - Thunderbird 12). r=karlt, a=lsblakk (upstream in FF14)
|
|
|
|
diff --git a/widget/gtk2/nsSound.cpp b/widget/gtk2/nsSound.cpp
|
|
--- a/widget/gtk2/nsSound.cpp
|
|
+++ b/widget/gtk2/nsSound.cpp
|
|
@@ -353,23 +353,28 @@ NS_METHOD nsSound::Play(nsIURL *aURL)
|
|
bool isFile;
|
|
nsresult rv = aURL->SchemeIs("file", &isFile);
|
|
if (NS_SUCCEEDED(rv) && isFile) {
|
|
ca_context* ctx = ca_context_get_default();
|
|
if (!ctx) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
- nsCAutoString path;
|
|
- rv = aURL->GetPath(path);
|
|
+ nsCAutoString spec;
|
|
+ rv = aURL->GetSpec(spec);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
+ gchar *path = g_filename_from_uri(spec.get(), NULL, NULL);
|
|
+ if (!path) {
|
|
+ return NS_ERROR_FILE_UNRECOGNIZED_PATH;
|
|
+ }
|
|
|
|
- ca_context_play(ctx, 0, "media.filename", path.get(), NULL);
|
|
+ ca_context_play(ctx, 0, "media.filename", path, NULL);
|
|
+ g_free(path);
|
|
} else {
|
|
nsCOMPtr<nsIStreamLoader> loader;
|
|
rv = NS_NewStreamLoader(getter_AddRefs(loader), aURL, this);
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|